Updated the map system & APIs