User model updated to new requirements.