Somewhat more conventional architecture change (repository)