Changed command line interface