Replaced old consumer-producer with new version