Update Class module, impact from refactoring abstract repository class