Changes for cli