HHH-7900 Began skeleton code for annotated M2M maps