Update Orchestrator classes