User Model Refactoring