Working on the repository methods