Added cli managment.