Command line improvements