Improve CLI