[MAL-1] Made some changes to the Repository.