CLI improvement