WIP: Backwards compatible MountPointService