Added support for command line arguments in Controller