added dw extra support to data model