Repository pattern Fixed