Updates to dataset loading in TSA