Updated the map to fix issues