Make refactoring of user repository