Refactoring membership path
Merge branch 'refactoring_membership'