Added support for cli options