Command line interface improvements