Refactor Producer