Improve basic CLI