Updated ProviderTerminalManager