Cli class update