Added support for entering command line arguments