adjustments to handle custom provider data