Adding support for CLI