Subscriber defining. Minor other fixes. The not used default fields removed.