Updated the map format