Move map into interface