Removed directory specific information, allows for more generic mountpoints