Adding the map refactor for real