Command line interface improved.