Changed for using new CommandExecutorBase API