Some changes to make producer work