Added key producer support