added support for CLI