Updated MountPoint implementation