Datasource changes supporting crosstab

Latest datasource changes supporting crosstab