Some changes in CommandExecutor