Fix cliframework API