Update CLI script to use CLIBuilder