Updated to newest CLIUtils