Refactored DShieldDataProvider