Adding the map refactor