improved data source initializations