CLI improved.