Added producer infrastructure