Few changes in DataModelAdaptor