Updated typehinting on the map objects.