Adding code to skip ValueProviders