Fixed up DShieldDataProvider