Move map handling to api v2