Modify CommandExecutor to inline with original design