MemberPatch refactoring