MemberHandler refactoring