Added option to run from the CLI