Refactored the MapBuilder a bit