Add back cli library