Refactoring users model