Restore base repository implementation and just keep the cType resolution to infer types from related entities