Use new maps.xml formatting