Adapt the AbstractDomainRepository to the recent changes