Refactored orchestrator type detection