Added an improved command line interface