Refactored orchestration extensions.