Adds CLI class and better support working jobs via daemon