Fixed the CLI for New Common Framework