Fixed generic repositories