Changed to use new CommandExecutorBase API
Changed for using new CommandExecutorBase API