Update the CLI tool due to core API change.