changes related to new class Repository