Added circle support to map objects.