Refactoring Membership Architecture