Changes to map API