Add support for provider_id in stateManager