M2M Refactor (Phase 11)