More refactoring to reduce architecture tangles