Added support for commandline arguments