Manage members Refactoring

Next one :)