Added support for command line arguments