More work on the map module