Consumption refactoring