Changes to support displaying copied units in the CLI