Updated to latest version of CommandExecutorBase