*** Added support for cli launch