Rework of producer logic.