More work on modularizing the map