integrated new cli structure here.