Modified file system and other changes