Added dom-id to all outputs