Changed file structure for map