Updated data provider