Add user domain model specification - refactor