imroved cli classes