Changes to CLI tool.