Added support for multiple runs as well as command line parameters