Re-map API