Add KMS 221 support