Modified the map format