Updates to the CLI