OOP-344 Repository