Add Command Line Support