Lasts improvements in CLI