Add map data support