Prepared new CLI