Refectoring Repository