NEW: Consolidated command nodes