Now using the domain models in the repositories