Refactored products