Updated commandline api