Update CLI to support multiple attribute names