Refactored producer