Added support for command line options