Rewritten Generic Repository methods