Updated the map functionality to complete #91.