Work on map rendering