HHH-7900 Annotated M2M maps