Adding code to manage mount points