More legacy vs. new refactoring