Refactor UserPersistenceModel

See Refactoring Wiki