Improve the command line utility to accept parameters/switches