Updated data provider to handle differently multiple and single datasets