Another change in approach with the repositories