Working on map integration