members model refactoring