Command line syntax improved