Updated CLI output to match Amazon CLI output.