Add CommandLineUtil