Changed the structure of user repository