Updated CommandExecutor