Adds full functionality to CLI