Implemented CLI support
Implemented CLI support