Updated data provider with more cases