Refactored savingQueueTimeout in Orchestrator