Changed user model and repository