Changed provider/publisher to dynamic field