Work on map module