Makes the CLI compatible with the API changes