Cli class changes