worked on Flat & StructuredDataSet
changed FlatDataSet & StructuredDataSet