Moving mappings to the annotations