Added a couple of dependencies to start
Refactored the CLI [ci skip]