Refactored DShieldDataProvider; miscellaneous tweaks