Updated map loading to work with the map editor