Refactored Producer