Added support for CLI parameters