Enhanced ShadowServerDataProvider functionality; miscellaneous other changes