Latest datsource changes supporting crosstab.