diff --git a/VERSION b/VERSION
index 2cded16da2b..0575cdbbd1c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.359
\ No newline at end of file
+1.11.360
\ No newline at end of file
diff --git a/generated/src/aws-cpp-sdk-cognito-identity/source/CognitoIdentityEndpointRules.cpp b/generated/src/aws-cpp-sdk-cognito-identity/source/CognitoIdentityEndpointRules.cpp
index e93cbbaa8ca..512bc33a96a 100644
--- a/generated/src/aws-cpp-sdk-cognito-identity/source/CognitoIdentityEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-cognito-identity/source/CognitoIdentityEndpointRules.cpp
@@ -51,108 +51,108 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
-'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
-'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
 'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','g','n',
-'i','t','o','-','i','d','e','n','t','i','t','y','-','f','i','p','s','.','{','R','e','g','i','o','n',
-'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t',
-'a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e',
-'s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e',
-'"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i',
-'o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',
-' ','D','u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b',
-'u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o',
-'t',' ','s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t',
-'y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i',
-'o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l',
-'s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P',
-'S','"','}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',
-',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o',
-'n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']',
-'}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s',
-'"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p',
-'o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','g',
-'n','i','t','o','-','i','d','e','n','t','i','t','y','-','f','i','p','s','.','{','R','e','g','i','o',
-'n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u',
-'f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h',
-'e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o',
-'i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',',
-'"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ',
-'b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n',
-'o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"',
-'e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k',
-'"','}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',',
-'"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
 '"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
-'v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',',
-'"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n',
-'R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a',
-'c','k','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r',
-'u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
-'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/',
-'/','c','o','g','n','i','t','o','-','i','d','e','n','t','i','t','y','.','{','R','e','g','i','o','n',
-'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t',
-'a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e',
-'s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e',
-'"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i',
-'o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c',
-'k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r',
-'t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D',
-'u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p',
-'o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','g',
-'n','i','t','o','-','i','d','e','n','t','i','t','y','.','{','R','e','g','i','o','n','}','.','{','P',
-'a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}',
-'"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r',
-'s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',
-']','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
+'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
+'"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','g','n','i','t','o','-','i','d',
+'e','n','t','i','t','y','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r',
+'t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s',
+'S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',',
+'"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d',
+'p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{',
+'"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"',
+'F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n',
+'a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',
+' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ',
+'b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t',
+'y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s',
+'"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',',
+'"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',
+',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','f','n','"',':','"','g','e','t','A','t',
+'t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i',
+'t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P',
+'S','"',']','}',',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c',
+'o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':',
+'{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','g','n','i','t','o','-','i',
+'d','e','n','t','i','t','y','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a',
+'r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',
+',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s',
+'"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',
+',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i',
+'o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ',
+'e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o',
+'n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',',
+'"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"',
+'t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f',
+'n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',
+':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',',
+'t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a',
+'l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g',
+'e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P',
+'a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t',
+'s','D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':',
+'[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i',
+'n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','g','n','i',
+'t','o','-','i','d','e','n','t','i','t','y','.','{','R','e','g','i','o','n','}','.','{','P','a','r',
+'t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s',
+'S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',',
+'"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d',
+'p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{',
+'"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"',
+'D','u','a','l','S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ',
+'t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s',
+'u','p','p','o','r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',',
+'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n',
+'t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','o','g','n','i','t',
+'o','-','i','d','e','n','t','i','t','y','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t',
+'i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"',
+'p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':',
+'{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"',
+'t','y','p','e','"',':','"','t','r','e','e','"','}',']',',','"','t','y','p','e','"',':','"','t','r',
+'e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r',
 'r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i',
 'o','n',':',' ','M','i','s','s','i','n','g',' ','R','e','g','i','o','n','"',',','"','t','y','p','e',
 '"',':','"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectClient.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectClient.h
index 45b8f9908a8..2854759bf86 100644
--- a/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectClient.h
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectClient.h
@@ -16,14 +16,19 @@ namespace Aws
 namespace Connect
 {
   /**
-   * <p>Amazon Connect is a cloud-based contact center solution that you use to set
-   * up and manage a customer contact center and provide reliable customer engagement
-   * at any scale.</p> <p>Amazon Connect provides metrics and real-time reporting
-   * that enable you to optimize contact routing. You can also resolve customer
-   * issues more efficiently by getting customers in touch with the appropriate
-   * agents.</p> <p>There are limits to the number of Amazon Connect resources that
-   * you can create. There are also limits to the number of requests that you can
-   * make per second. For more information, see <a
+   * <ul> <li> <p> <a
+   * href="https://docs.aws.amazon.com/connect/latest/APIReference/API_Operations_Amazon_Connect_Service.html">Amazon
+   * Connect actions</a> </p> </li> <li> <p> <a
+   * href="https://docs.aws.amazon.com/connect/latest/APIReference/API_Types_Amazon_Connect_Service.html">Amazon
+   * Connect data types</a> </p> </li> </ul> <p>Amazon Connect is a cloud-based
+   * contact center solution that you use to set up and manage a customer contact
+   * center and provide reliable customer engagement at any scale.</p> <p>Amazon
+   * Connect provides metrics and real-time reporting that enable you to optimize
+   * contact routing. You can also resolve customer issues more efficiently by
+   * getting customers in touch with the appropriate agents.</p> <p>There are limits
+   * to the number of Amazon Connect resources that you can create. There are also
+   * limits to the number of requests that you can make per second. For more
+   * information, see <a
    * href="https://docs.aws.amazon.com/connect/latest/adminguide/amazon-connect-service-limits.html">Amazon
    * Connect Service Quotas</a> in the <i>Amazon Connect Administrator Guide</i>.</p>
    * <p>You can connect programmatically to an Amazon Web Services service by using
@@ -2103,6 +2108,33 @@ namespace Connect
             return SubmitAsync(&ConnectClient::DescribeAgentStatus, request, handler, context);
         }
 
+        /**
+         * <p>This API is in preview release for Amazon Connect and is subject to change.
+         * To request access to this API, contact Amazon Web Services Support.</p>
+         * <p>Describes the target authentication profile.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/connect-2017-08-08/DescribeAuthenticationProfile">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::DescribeAuthenticationProfileOutcome DescribeAuthenticationProfile(const Model::DescribeAuthenticationProfileRequest& request) const;
+
+        /**
+         * A Callable wrapper for DescribeAuthenticationProfile that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename DescribeAuthenticationProfileRequestT = Model::DescribeAuthenticationProfileRequest>
+        Model::DescribeAuthenticationProfileOutcomeCallable DescribeAuthenticationProfileCallable(const DescribeAuthenticationProfileRequestT& request) const
+        {
+            return SubmitCallable(&ConnectClient::DescribeAuthenticationProfile, request);
+        }
+
+        /**
+         * An Async wrapper for DescribeAuthenticationProfile that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename DescribeAuthenticationProfileRequestT = Model::DescribeAuthenticationProfileRequest>
+        void DescribeAuthenticationProfileAsync(const DescribeAuthenticationProfileRequestT& request, const DescribeAuthenticationProfileResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&ConnectClient::DescribeAuthenticationProfile, request, handler, context);
+        }
+
         /**
          * <p>This API is in preview release for Amazon Connect and is subject to
          * change.</p> <p>Describes the specified contact. </p>  <p>Contact
@@ -3567,6 +3599,34 @@ namespace Connect
             return SubmitAsync(&ConnectClient::ListApprovedOrigins, request, handler, context);
         }
 
+        /**
+         * <p>This API is in preview release for Amazon Connect and is subject to change.
+         * To request access to this API, contact Amazon Web Services Support.</p>
+         * <p>Provides summary information about the authentication profiles in a specified
+         * Amazon Connect instance.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/connect-2017-08-08/ListAuthenticationProfiles">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ListAuthenticationProfilesOutcome ListAuthenticationProfiles(const Model::ListAuthenticationProfilesRequest& request) const;
+
+        /**
+         * A Callable wrapper for ListAuthenticationProfiles that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename ListAuthenticationProfilesRequestT = Model::ListAuthenticationProfilesRequest>
+        Model::ListAuthenticationProfilesOutcomeCallable ListAuthenticationProfilesCallable(const ListAuthenticationProfilesRequestT& request) const
+        {
+            return SubmitCallable(&ConnectClient::ListAuthenticationProfiles, request);
+        }
+
+        /**
+         * An Async wrapper for ListAuthenticationProfiles that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename ListAuthenticationProfilesRequestT = Model::ListAuthenticationProfilesRequest>
+        void ListAuthenticationProfilesAsync(const ListAuthenticationProfilesRequestT& request, const ListAuthenticationProfilesResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&ConnectClient::ListAuthenticationProfiles, request, handler, context);
+        }
+
         /**
          * <p>This API is in preview release for Amazon Connect and is subject to
          * change.</p> <p>For the specified version of Amazon Lex, returns a paginated list
@@ -5324,10 +5384,10 @@ namespace Connect
 
         /**
          * <p>Provides a pre-signed Amazon S3 URL in response for uploading your
-         * content.</p>  <p>You may only use this API to upload attachments to a
-         * <a
-         * href="https://docs.aws.amazon.com/connect/latest/APIReference/API_connect-cases_CreateCase.html">Connect
-         * Case</a>.</p> <p><h3>See Also:</h3>   <a
+         * content.</p>  <p>You may only use this API to upload attachments to
+         * an <a
+         * href="https://docs.aws.amazon.com/connect/latest/APIReference/API_connect-cases_CreateCase.html">Amazon
+         * Connect Case</a>.</p> <p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/connect-2017-08-08/StartAttachedFileUpload">AWS
          * API Reference</a></p>
          */
@@ -5961,6 +6021,33 @@ namespace Connect
             return SubmitAsync(&ConnectClient::UpdateAgentStatus, request, handler, context);
         }
 
+        /**
+         * <p>This API is in preview release for Amazon Connect and is subject to change.
+         * To request access to this API, contact Amazon Web Services Support.</p>
+         * <p>Updates the selected authentication profile.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/connect-2017-08-08/UpdateAuthenticationProfile">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::UpdateAuthenticationProfileOutcome UpdateAuthenticationProfile(const Model::UpdateAuthenticationProfileRequest& request) const;
+
+        /**
+         * A Callable wrapper for UpdateAuthenticationProfile that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename UpdateAuthenticationProfileRequestT = Model::UpdateAuthenticationProfileRequest>
+        Model::UpdateAuthenticationProfileOutcomeCallable UpdateAuthenticationProfileCallable(const UpdateAuthenticationProfileRequestT& request) const
+        {
+            return SubmitCallable(&ConnectClient::UpdateAuthenticationProfile, request);
+        }
+
+        /**
+         * An Async wrapper for UpdateAuthenticationProfile that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename UpdateAuthenticationProfileRequestT = Model::UpdateAuthenticationProfileRequest>
+        void UpdateAuthenticationProfileAsync(const UpdateAuthenticationProfileRequestT& request, const UpdateAuthenticationProfileResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&ConnectClient::UpdateAuthenticationProfile, request, handler, context);
+        }
+
         /**
          * <p>This API is in preview release for Amazon Connect and is subject to
          * change.</p> <p>Adds or updates user-defined contact information associated with
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectServiceClientModel.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectServiceClientModel.h
index c8f30f5c0f1..e1895b6df31 100644
--- a/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectServiceClientModel.h
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/ConnectServiceClientModel.h
@@ -65,6 +65,7 @@
 #include <aws/connect/model/DeleteViewVersionResult.h>
 #include <aws/connect/model/DeleteVocabularyResult.h>
 #include <aws/connect/model/DescribeAgentStatusResult.h>
+#include <aws/connect/model/DescribeAuthenticationProfileResult.h>
 #include <aws/connect/model/DescribeContactResult.h>
 #include <aws/connect/model/DescribeContactEvaluationResult.h>
 #include <aws/connect/model/DescribeContactFlowResult.h>
@@ -106,6 +107,7 @@
 #include <aws/connect/model/ListAgentStatusesResult.h>
 #include <aws/connect/model/ListAnalyticsDataAssociationsResult.h>
 #include <aws/connect/model/ListApprovedOriginsResult.h>
+#include <aws/connect/model/ListAuthenticationProfilesResult.h>
 #include <aws/connect/model/ListBotsResult.h>
 #include <aws/connect/model/ListContactEvaluationsResult.h>
 #include <aws/connect/model/ListContactFlowModulesResult.h>
@@ -317,6 +319,7 @@ namespace Aws
       class DeleteViewVersionRequest;
       class DeleteVocabularyRequest;
       class DescribeAgentStatusRequest;
+      class DescribeAuthenticationProfileRequest;
       class DescribeContactRequest;
       class DescribeContactEvaluationRequest;
       class DescribeContactFlowRequest;
@@ -369,6 +372,7 @@ namespace Aws
       class ListAgentStatusesRequest;
       class ListAnalyticsDataAssociationsRequest;
       class ListApprovedOriginsRequest;
+      class ListAuthenticationProfilesRequest;
       class ListBotsRequest;
       class ListContactEvaluationsRequest;
       class ListContactFlowModulesRequest;
@@ -451,6 +455,7 @@ namespace Aws
       class UntagContactRequest;
       class UntagResourceRequest;
       class UpdateAgentStatusRequest;
+      class UpdateAuthenticationProfileRequest;
       class UpdateContactRequest;
       class UpdateContactAttributesRequest;
       class UpdateContactEvaluationRequest;
@@ -570,6 +575,7 @@ namespace Aws
       typedef Aws::Utils::Outcome<DeleteViewVersionResult, ConnectError> DeleteViewVersionOutcome;
       typedef Aws::Utils::Outcome<DeleteVocabularyResult, ConnectError> DeleteVocabularyOutcome;
       typedef Aws::Utils::Outcome<DescribeAgentStatusResult, ConnectError> DescribeAgentStatusOutcome;
+      typedef Aws::Utils::Outcome<DescribeAuthenticationProfileResult, ConnectError> DescribeAuthenticationProfileOutcome;
       typedef Aws::Utils::Outcome<DescribeContactResult, ConnectError> DescribeContactOutcome;
       typedef Aws::Utils::Outcome<DescribeContactEvaluationResult, ConnectError> DescribeContactEvaluationOutcome;
       typedef Aws::Utils::Outcome<DescribeContactFlowResult, ConnectError> DescribeContactFlowOutcome;
@@ -622,6 +628,7 @@ namespace Aws
       typedef Aws::Utils::Outcome<ListAgentStatusesResult, ConnectError> ListAgentStatusesOutcome;
       typedef Aws::Utils::Outcome<ListAnalyticsDataAssociationsResult, ConnectError> ListAnalyticsDataAssociationsOutcome;
       typedef Aws::Utils::Outcome<ListApprovedOriginsResult, ConnectError> ListApprovedOriginsOutcome;
+      typedef Aws::Utils::Outcome<ListAuthenticationProfilesResult, ConnectError> ListAuthenticationProfilesOutcome;
       typedef Aws::Utils::Outcome<ListBotsResult, ConnectError> ListBotsOutcome;
       typedef Aws::Utils::Outcome<ListContactEvaluationsResult, ConnectError> ListContactEvaluationsOutcome;
       typedef Aws::Utils::Outcome<ListContactFlowModulesResult, ConnectError> ListContactFlowModulesOutcome;
@@ -704,6 +711,7 @@ namespace Aws
       typedef Aws::Utils::Outcome<UntagContactResult, ConnectError> UntagContactOutcome;
       typedef Aws::Utils::Outcome<Aws::NoResult, ConnectError> UntagResourceOutcome;
       typedef Aws::Utils::Outcome<Aws::NoResult, ConnectError> UpdateAgentStatusOutcome;
+      typedef Aws::Utils::Outcome<Aws::NoResult, ConnectError> UpdateAuthenticationProfileOutcome;
       typedef Aws::Utils::Outcome<UpdateContactResult, ConnectError> UpdateContactOutcome;
       typedef Aws::Utils::Outcome<UpdateContactAttributesResult, ConnectError> UpdateContactAttributesOutcome;
       typedef Aws::Utils::Outcome<UpdateContactEvaluationResult, ConnectError> UpdateContactEvaluationOutcome;
@@ -823,6 +831,7 @@ namespace Aws
       typedef std::future<DeleteViewVersionOutcome> DeleteViewVersionOutcomeCallable;
       typedef std::future<DeleteVocabularyOutcome> DeleteVocabularyOutcomeCallable;
       typedef std::future<DescribeAgentStatusOutcome> DescribeAgentStatusOutcomeCallable;
+      typedef std::future<DescribeAuthenticationProfileOutcome> DescribeAuthenticationProfileOutcomeCallable;
       typedef std::future<DescribeContactOutcome> DescribeContactOutcomeCallable;
       typedef std::future<DescribeContactEvaluationOutcome> DescribeContactEvaluationOutcomeCallable;
       typedef std::future<DescribeContactFlowOutcome> DescribeContactFlowOutcomeCallable;
@@ -875,6 +884,7 @@ namespace Aws
       typedef std::future<ListAgentStatusesOutcome> ListAgentStatusesOutcomeCallable;
       typedef std::future<ListAnalyticsDataAssociationsOutcome> ListAnalyticsDataAssociationsOutcomeCallable;
       typedef std::future<ListApprovedOriginsOutcome> ListApprovedOriginsOutcomeCallable;
+      typedef std::future<ListAuthenticationProfilesOutcome> ListAuthenticationProfilesOutcomeCallable;
       typedef std::future<ListBotsOutcome> ListBotsOutcomeCallable;
       typedef std::future<ListContactEvaluationsOutcome> ListContactEvaluationsOutcomeCallable;
       typedef std::future<ListContactFlowModulesOutcome> ListContactFlowModulesOutcomeCallable;
@@ -957,6 +967,7 @@ namespace Aws
       typedef std::future<UntagContactOutcome> UntagContactOutcomeCallable;
       typedef std::future<UntagResourceOutcome> UntagResourceOutcomeCallable;
       typedef std::future<UpdateAgentStatusOutcome> UpdateAgentStatusOutcomeCallable;
+      typedef std::future<UpdateAuthenticationProfileOutcome> UpdateAuthenticationProfileOutcomeCallable;
       typedef std::future<UpdateContactOutcome> UpdateContactOutcomeCallable;
       typedef std::future<UpdateContactAttributesOutcome> UpdateContactAttributesOutcomeCallable;
       typedef std::future<UpdateContactEvaluationOutcome> UpdateContactEvaluationOutcomeCallable;
@@ -1079,6 +1090,7 @@ namespace Aws
     typedef std::function<void(const ConnectClient*, const Model::DeleteViewVersionRequest&, const Model::DeleteViewVersionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteViewVersionResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::DeleteVocabularyRequest&, const Model::DeleteVocabularyOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteVocabularyResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::DescribeAgentStatusRequest&, const Model::DescribeAgentStatusOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeAgentStatusResponseReceivedHandler;
+    typedef std::function<void(const ConnectClient*, const Model::DescribeAuthenticationProfileRequest&, const Model::DescribeAuthenticationProfileOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeAuthenticationProfileResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::DescribeContactRequest&, const Model::DescribeContactOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeContactResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::DescribeContactEvaluationRequest&, const Model::DescribeContactEvaluationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeContactEvaluationResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::DescribeContactFlowRequest&, const Model::DescribeContactFlowOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeContactFlowResponseReceivedHandler;
@@ -1131,6 +1143,7 @@ namespace Aws
     typedef std::function<void(const ConnectClient*, const Model::ListAgentStatusesRequest&, const Model::ListAgentStatusesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListAgentStatusesResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::ListAnalyticsDataAssociationsRequest&, const Model::ListAnalyticsDataAssociationsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListAnalyticsDataAssociationsResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::ListApprovedOriginsRequest&, const Model::ListApprovedOriginsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListApprovedOriginsResponseReceivedHandler;
+    typedef std::function<void(const ConnectClient*, const Model::ListAuthenticationProfilesRequest&, const Model::ListAuthenticationProfilesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListAuthenticationProfilesResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::ListBotsRequest&, const Model::ListBotsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListBotsResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::ListContactEvaluationsRequest&, const Model::ListContactEvaluationsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListContactEvaluationsResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::ListContactFlowModulesRequest&, const Model::ListContactFlowModulesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListContactFlowModulesResponseReceivedHandler;
@@ -1213,6 +1226,7 @@ namespace Aws
     typedef std::function<void(const ConnectClient*, const Model::UntagContactRequest&, const Model::UntagContactOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UntagContactResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::UntagResourceRequest&, const Model::UntagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UntagResourceResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::UpdateAgentStatusRequest&, const Model::UpdateAgentStatusOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateAgentStatusResponseReceivedHandler;
+    typedef std::function<void(const ConnectClient*, const Model::UpdateAuthenticationProfileRequest&, const Model::UpdateAuthenticationProfileOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateAuthenticationProfileResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::UpdateContactRequest&, const Model::UpdateContactOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateContactResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::UpdateContactAttributesRequest&, const Model::UpdateContactAttributesOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateContactAttributesResponseReceivedHandler;
     typedef std::function<void(const ConnectClient*, const Model::UpdateContactEvaluationRequest&, const Model::UpdateContactEvaluationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateContactEvaluationResponseReceivedHandler;
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/AuthenticationProfile.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/AuthenticationProfile.h
new file mode 100644
index 00000000000..6d9cbd0859b
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/AuthenticationProfile.h
@@ -0,0 +1,265 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/connect/Connect_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/DateTime.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace Connect
+{
+namespace Model
+{
+
+  /**
+   * <p>This API is in preview release for Amazon Connect and is subject to change.
+   * To request access to this API, contact Amazon Web Services Support.</p>
+   * <p>Information about an authentication profile. An authentication profile is a
+   * resource that stores the authentication settings for users in your contact
+   * center. You use authentication profiles to set up IP address range restrictions
+   * and session timeouts. For more information, see <a
+   * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html">Set
+   * IP address restrictions or session timeouts</a>. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/connect-2017-08-08/AuthenticationProfile">AWS
+   * API Reference</a></p>
+   */
+  class AuthenticationProfile
+  {
+  public:
+    AWS_CONNECT_API AuthenticationProfile();
+    AWS_CONNECT_API AuthenticationProfile(Aws::Utils::Json::JsonView jsonValue);
+    AWS_CONNECT_API AuthenticationProfile& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_CONNECT_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    ///@{
+    /**
+     * <p>A unique identifier for the authentication profile. </p>
+     */
+    inline const Aws::String& GetId() const{ return m_id; }
+    inline bool IdHasBeenSet() const { return m_idHasBeenSet; }
+    inline void SetId(const Aws::String& value) { m_idHasBeenSet = true; m_id = value; }
+    inline void SetId(Aws::String&& value) { m_idHasBeenSet = true; m_id = std::move(value); }
+    inline void SetId(const char* value) { m_idHasBeenSet = true; m_id.assign(value); }
+    inline AuthenticationProfile& WithId(const Aws::String& value) { SetId(value); return *this;}
+    inline AuthenticationProfile& WithId(Aws::String&& value) { SetId(std::move(value)); return *this;}
+    inline AuthenticationProfile& WithId(const char* value) { SetId(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The Amazon Resource Name (ARN) for the authentication profile.</p>
+     */
+    inline const Aws::String& GetArn() const{ return m_arn; }
+    inline bool ArnHasBeenSet() const { return m_arnHasBeenSet; }
+    inline void SetArn(const Aws::String& value) { m_arnHasBeenSet = true; m_arn = value; }
+    inline void SetArn(Aws::String&& value) { m_arnHasBeenSet = true; m_arn = std::move(value); }
+    inline void SetArn(const char* value) { m_arnHasBeenSet = true; m_arn.assign(value); }
+    inline AuthenticationProfile& WithArn(const Aws::String& value) { SetArn(value); return *this;}
+    inline AuthenticationProfile& WithArn(Aws::String&& value) { SetArn(std::move(value)); return *this;}
+    inline AuthenticationProfile& WithArn(const char* value) { SetArn(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The name for the authentication profile.</p>
+     */
+    inline const Aws::String& GetName() const{ return m_name; }
+    inline bool NameHasBeenSet() const { return m_nameHasBeenSet; }
+    inline void SetName(const Aws::String& value) { m_nameHasBeenSet = true; m_name = value; }
+    inline void SetName(Aws::String&& value) { m_nameHasBeenSet = true; m_name = std::move(value); }
+    inline void SetName(const char* value) { m_nameHasBeenSet = true; m_name.assign(value); }
+    inline AuthenticationProfile& WithName(const Aws::String& value) { SetName(value); return *this;}
+    inline AuthenticationProfile& WithName(Aws::String&& value) { SetName(std::move(value)); return *this;}
+    inline AuthenticationProfile& WithName(const char* value) { SetName(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The description for the authentication profile.</p>
+     */
+    inline const Aws::String& GetDescription() const{ return m_description; }
+    inline bool DescriptionHasBeenSet() const { return m_descriptionHasBeenSet; }
+    inline void SetDescription(const Aws::String& value) { m_descriptionHasBeenSet = true; m_description = value; }
+    inline void SetDescription(Aws::String&& value) { m_descriptionHasBeenSet = true; m_description = std::move(value); }
+    inline void SetDescription(const char* value) { m_descriptionHasBeenSet = true; m_description.assign(value); }
+    inline AuthenticationProfile& WithDescription(const Aws::String& value) { SetDescription(value); return *this;}
+    inline AuthenticationProfile& WithDescription(Aws::String&& value) { SetDescription(std::move(value)); return *this;}
+    inline AuthenticationProfile& WithDescription(const char* value) { SetDescription(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>A list of IP address range strings that are allowed to access the Amazon
+     * Connect instance. For more information about how to configure IP addresses, see
+     * <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-ip-based-ac">Configure
+     * IP address based access control</a> in the <i>Amazon Connect Administrator
+     * Guide</i>.</p>
+     */
+    inline const Aws::Vector<Aws::String>& GetAllowedIps() const{ return m_allowedIps; }
+    inline bool AllowedIpsHasBeenSet() const { return m_allowedIpsHasBeenSet; }
+    inline void SetAllowedIps(const Aws::Vector<Aws::String>& value) { m_allowedIpsHasBeenSet = true; m_allowedIps = value; }
+    inline void SetAllowedIps(Aws::Vector<Aws::String>&& value) { m_allowedIpsHasBeenSet = true; m_allowedIps = std::move(value); }
+    inline AuthenticationProfile& WithAllowedIps(const Aws::Vector<Aws::String>& value) { SetAllowedIps(value); return *this;}
+    inline AuthenticationProfile& WithAllowedIps(Aws::Vector<Aws::String>&& value) { SetAllowedIps(std::move(value)); return *this;}
+    inline AuthenticationProfile& AddAllowedIps(const Aws::String& value) { m_allowedIpsHasBeenSet = true; m_allowedIps.push_back(value); return *this; }
+    inline AuthenticationProfile& AddAllowedIps(Aws::String&& value) { m_allowedIpsHasBeenSet = true; m_allowedIps.push_back(std::move(value)); return *this; }
+    inline AuthenticationProfile& AddAllowedIps(const char* value) { m_allowedIpsHasBeenSet = true; m_allowedIps.push_back(value); return *this; }
+    ///@}
+
+    ///@{
+    /**
+     * <p>A list of IP address range strings that are blocked from accessing the Amazon
+     * Connect instance. For more information about how to configure IP addresses, see
+     * <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-ip-based-ac">Configure
+     * IP address based access control</a> in the <i>Amazon Connect Administrator
+     * Guide</i>.</p>
+     */
+    inline const Aws::Vector<Aws::String>& GetBlockedIps() const{ return m_blockedIps; }
+    inline bool BlockedIpsHasBeenSet() const { return m_blockedIpsHasBeenSet; }
+    inline void SetBlockedIps(const Aws::Vector<Aws::String>& value) { m_blockedIpsHasBeenSet = true; m_blockedIps = value; }
+    inline void SetBlockedIps(Aws::Vector<Aws::String>&& value) { m_blockedIpsHasBeenSet = true; m_blockedIps = std::move(value); }
+    inline AuthenticationProfile& WithBlockedIps(const Aws::Vector<Aws::String>& value) { SetBlockedIps(value); return *this;}
+    inline AuthenticationProfile& WithBlockedIps(Aws::Vector<Aws::String>&& value) { SetBlockedIps(std::move(value)); return *this;}
+    inline AuthenticationProfile& AddBlockedIps(const Aws::String& value) { m_blockedIpsHasBeenSet = true; m_blockedIps.push_back(value); return *this; }
+    inline AuthenticationProfile& AddBlockedIps(Aws::String&& value) { m_blockedIpsHasBeenSet = true; m_blockedIps.push_back(std::move(value)); return *this; }
+    inline AuthenticationProfile& AddBlockedIps(const char* value) { m_blockedIpsHasBeenSet = true; m_blockedIps.push_back(value); return *this; }
+    ///@}
+
+    ///@{
+    /**
+     * <p>Shows whether the authentication profile is the default authentication
+     * profile for the Amazon Connect instance. The default authentication profile
+     * applies to all agents in an Amazon Connect instance, unless overridden by
+     * another authentication profile.</p>
+     */
+    inline bool GetIsDefault() const{ return m_isDefault; }
+    inline bool IsDefaultHasBeenSet() const { return m_isDefaultHasBeenSet; }
+    inline void SetIsDefault(bool value) { m_isDefaultHasBeenSet = true; m_isDefault = value; }
+    inline AuthenticationProfile& WithIsDefault(bool value) { SetIsDefault(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The timestamp when the authentication profile was created.</p>
+     */
+    inline const Aws::Utils::DateTime& GetCreatedTime() const{ return m_createdTime; }
+    inline bool CreatedTimeHasBeenSet() const { return m_createdTimeHasBeenSet; }
+    inline void SetCreatedTime(const Aws::Utils::DateTime& value) { m_createdTimeHasBeenSet = true; m_createdTime = value; }
+    inline void SetCreatedTime(Aws::Utils::DateTime&& value) { m_createdTimeHasBeenSet = true; m_createdTime = std::move(value); }
+    inline AuthenticationProfile& WithCreatedTime(const Aws::Utils::DateTime& value) { SetCreatedTime(value); return *this;}
+    inline AuthenticationProfile& WithCreatedTime(Aws::Utils::DateTime&& value) { SetCreatedTime(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The timestamp when the authentication profile was last modified.</p>
+     */
+    inline const Aws::Utils::DateTime& GetLastModifiedTime() const{ return m_lastModifiedTime; }
+    inline bool LastModifiedTimeHasBeenSet() const { return m_lastModifiedTimeHasBeenSet; }
+    inline void SetLastModifiedTime(const Aws::Utils::DateTime& value) { m_lastModifiedTimeHasBeenSet = true; m_lastModifiedTime = value; }
+    inline void SetLastModifiedTime(Aws::Utils::DateTime&& value) { m_lastModifiedTimeHasBeenSet = true; m_lastModifiedTime = std::move(value); }
+    inline AuthenticationProfile& WithLastModifiedTime(const Aws::Utils::DateTime& value) { SetLastModifiedTime(value); return *this;}
+    inline AuthenticationProfile& WithLastModifiedTime(Aws::Utils::DateTime&& value) { SetLastModifiedTime(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The Amazon Web Services Region where the authentication profile was last
+     * modified.</p>
+     */
+    inline const Aws::String& GetLastModifiedRegion() const{ return m_lastModifiedRegion; }
+    inline bool LastModifiedRegionHasBeenSet() const { return m_lastModifiedRegionHasBeenSet; }
+    inline void SetLastModifiedRegion(const Aws::String& value) { m_lastModifiedRegionHasBeenSet = true; m_lastModifiedRegion = value; }
+    inline void SetLastModifiedRegion(Aws::String&& value) { m_lastModifiedRegionHasBeenSet = true; m_lastModifiedRegion = std::move(value); }
+    inline void SetLastModifiedRegion(const char* value) { m_lastModifiedRegionHasBeenSet = true; m_lastModifiedRegion.assign(value); }
+    inline AuthenticationProfile& WithLastModifiedRegion(const Aws::String& value) { SetLastModifiedRegion(value); return *this;}
+    inline AuthenticationProfile& WithLastModifiedRegion(Aws::String&& value) { SetLastModifiedRegion(std::move(value)); return *this;}
+    inline AuthenticationProfile& WithLastModifiedRegion(const char* value) { SetLastModifiedRegion(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The short lived session duration configuration for users logged in to Amazon
+     * Connect, in minutes. This value determines the maximum possible time before an
+     * agent is authenticated. For more information, see <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts">Configure
+     * the session duration</a> in the <i>Amazon Connect Administrator Guide</i>.</p>
+     */
+    inline int GetPeriodicSessionDuration() const{ return m_periodicSessionDuration; }
+    inline bool PeriodicSessionDurationHasBeenSet() const { return m_periodicSessionDurationHasBeenSet; }
+    inline void SetPeriodicSessionDuration(int value) { m_periodicSessionDurationHasBeenSet = true; m_periodicSessionDuration = value; }
+    inline AuthenticationProfile& WithPeriodicSessionDuration(int value) { SetPeriodicSessionDuration(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The long lived session duration for users logged in to Amazon Connect, in
+     * minutes. After this time period, users must log in again. For more information,
+     * see <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts">Configure
+     * the session duration</a> in the <i>Amazon Connect Administrator Guide</i>.</p>
+     */
+    inline int GetMaxSessionDuration() const{ return m_maxSessionDuration; }
+    inline bool MaxSessionDurationHasBeenSet() const { return m_maxSessionDurationHasBeenSet; }
+    inline void SetMaxSessionDuration(int value) { m_maxSessionDurationHasBeenSet = true; m_maxSessionDuration = value; }
+    inline AuthenticationProfile& WithMaxSessionDuration(int value) { SetMaxSessionDuration(value); return *this;}
+    ///@}
+  private:
+
+    Aws::String m_id;
+    bool m_idHasBeenSet = false;
+
+    Aws::String m_arn;
+    bool m_arnHasBeenSet = false;
+
+    Aws::String m_name;
+    bool m_nameHasBeenSet = false;
+
+    Aws::String m_description;
+    bool m_descriptionHasBeenSet = false;
+
+    Aws::Vector<Aws::String> m_allowedIps;
+    bool m_allowedIpsHasBeenSet = false;
+
+    Aws::Vector<Aws::String> m_blockedIps;
+    bool m_blockedIpsHasBeenSet = false;
+
+    bool m_isDefault;
+    bool m_isDefaultHasBeenSet = false;
+
+    Aws::Utils::DateTime m_createdTime;
+    bool m_createdTimeHasBeenSet = false;
+
+    Aws::Utils::DateTime m_lastModifiedTime;
+    bool m_lastModifiedTimeHasBeenSet = false;
+
+    Aws::String m_lastModifiedRegion;
+    bool m_lastModifiedRegionHasBeenSet = false;
+
+    int m_periodicSessionDuration;
+    bool m_periodicSessionDurationHasBeenSet = false;
+
+    int m_maxSessionDuration;
+    bool m_maxSessionDurationHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/AuthenticationProfileSummary.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/AuthenticationProfileSummary.h
new file mode 100644
index 00000000000..0e7f7b79aa0
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/AuthenticationProfileSummary.h
@@ -0,0 +1,147 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/connect/Connect_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/DateTime.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace Connect
+{
+namespace Model
+{
+
+  /**
+   * <p>This API is in preview release for Amazon Connect and is subject to change.
+   * To request access to this API, contact Amazon Web Services Support.</p> <p>A
+   * summary of a given authentication profile.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/connect-2017-08-08/AuthenticationProfileSummary">AWS
+   * API Reference</a></p>
+   */
+  class AuthenticationProfileSummary
+  {
+  public:
+    AWS_CONNECT_API AuthenticationProfileSummary();
+    AWS_CONNECT_API AuthenticationProfileSummary(Aws::Utils::Json::JsonView jsonValue);
+    AWS_CONNECT_API AuthenticationProfileSummary& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_CONNECT_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    ///@{
+    /**
+     * <p>The unique identifier of the authentication profile.</p>
+     */
+    inline const Aws::String& GetId() const{ return m_id; }
+    inline bool IdHasBeenSet() const { return m_idHasBeenSet; }
+    inline void SetId(const Aws::String& value) { m_idHasBeenSet = true; m_id = value; }
+    inline void SetId(Aws::String&& value) { m_idHasBeenSet = true; m_id = std::move(value); }
+    inline void SetId(const char* value) { m_idHasBeenSet = true; m_id.assign(value); }
+    inline AuthenticationProfileSummary& WithId(const Aws::String& value) { SetId(value); return *this;}
+    inline AuthenticationProfileSummary& WithId(Aws::String&& value) { SetId(std::move(value)); return *this;}
+    inline AuthenticationProfileSummary& WithId(const char* value) { SetId(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The Amazon Resource Name (ARN) of the authentication profile summary.</p>
+     */
+    inline const Aws::String& GetArn() const{ return m_arn; }
+    inline bool ArnHasBeenSet() const { return m_arnHasBeenSet; }
+    inline void SetArn(const Aws::String& value) { m_arnHasBeenSet = true; m_arn = value; }
+    inline void SetArn(Aws::String&& value) { m_arnHasBeenSet = true; m_arn = std::move(value); }
+    inline void SetArn(const char* value) { m_arnHasBeenSet = true; m_arn.assign(value); }
+    inline AuthenticationProfileSummary& WithArn(const Aws::String& value) { SetArn(value); return *this;}
+    inline AuthenticationProfileSummary& WithArn(Aws::String&& value) { SetArn(std::move(value)); return *this;}
+    inline AuthenticationProfileSummary& WithArn(const char* value) { SetArn(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The name of the authentication profile summary.</p>
+     */
+    inline const Aws::String& GetName() const{ return m_name; }
+    inline bool NameHasBeenSet() const { return m_nameHasBeenSet; }
+    inline void SetName(const Aws::String& value) { m_nameHasBeenSet = true; m_name = value; }
+    inline void SetName(Aws::String&& value) { m_nameHasBeenSet = true; m_name = std::move(value); }
+    inline void SetName(const char* value) { m_nameHasBeenSet = true; m_name.assign(value); }
+    inline AuthenticationProfileSummary& WithName(const Aws::String& value) { SetName(value); return *this;}
+    inline AuthenticationProfileSummary& WithName(Aws::String&& value) { SetName(std::move(value)); return *this;}
+    inline AuthenticationProfileSummary& WithName(const char* value) { SetName(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>Shows whether the authentication profile is the default authentication
+     * profile for the Amazon Connect instance. The default authentication profile
+     * applies to all agents in an Amazon Connect instance, unless overridden by
+     * another authentication profile.</p>
+     */
+    inline bool GetIsDefault() const{ return m_isDefault; }
+    inline bool IsDefaultHasBeenSet() const { return m_isDefaultHasBeenSet; }
+    inline void SetIsDefault(bool value) { m_isDefaultHasBeenSet = true; m_isDefault = value; }
+    inline AuthenticationProfileSummary& WithIsDefault(bool value) { SetIsDefault(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The timestamp when the authentication profile summary was last modified.</p>
+     */
+    inline const Aws::Utils::DateTime& GetLastModifiedTime() const{ return m_lastModifiedTime; }
+    inline bool LastModifiedTimeHasBeenSet() const { return m_lastModifiedTimeHasBeenSet; }
+    inline void SetLastModifiedTime(const Aws::Utils::DateTime& value) { m_lastModifiedTimeHasBeenSet = true; m_lastModifiedTime = value; }
+    inline void SetLastModifiedTime(Aws::Utils::DateTime&& value) { m_lastModifiedTimeHasBeenSet = true; m_lastModifiedTime = std::move(value); }
+    inline AuthenticationProfileSummary& WithLastModifiedTime(const Aws::Utils::DateTime& value) { SetLastModifiedTime(value); return *this;}
+    inline AuthenticationProfileSummary& WithLastModifiedTime(Aws::Utils::DateTime&& value) { SetLastModifiedTime(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The Amazon Web Services Region when the authentication profile summary was
+     * last modified.</p>
+     */
+    inline const Aws::String& GetLastModifiedRegion() const{ return m_lastModifiedRegion; }
+    inline bool LastModifiedRegionHasBeenSet() const { return m_lastModifiedRegionHasBeenSet; }
+    inline void SetLastModifiedRegion(const Aws::String& value) { m_lastModifiedRegionHasBeenSet = true; m_lastModifiedRegion = value; }
+    inline void SetLastModifiedRegion(Aws::String&& value) { m_lastModifiedRegionHasBeenSet = true; m_lastModifiedRegion = std::move(value); }
+    inline void SetLastModifiedRegion(const char* value) { m_lastModifiedRegionHasBeenSet = true; m_lastModifiedRegion.assign(value); }
+    inline AuthenticationProfileSummary& WithLastModifiedRegion(const Aws::String& value) { SetLastModifiedRegion(value); return *this;}
+    inline AuthenticationProfileSummary& WithLastModifiedRegion(Aws::String&& value) { SetLastModifiedRegion(std::move(value)); return *this;}
+    inline AuthenticationProfileSummary& WithLastModifiedRegion(const char* value) { SetLastModifiedRegion(value); return *this;}
+    ///@}
+  private:
+
+    Aws::String m_id;
+    bool m_idHasBeenSet = false;
+
+    Aws::String m_arn;
+    bool m_arnHasBeenSet = false;
+
+    Aws::String m_name;
+    bool m_nameHasBeenSet = false;
+
+    bool m_isDefault;
+    bool m_isDefaultHasBeenSet = false;
+
+    Aws::Utils::DateTime m_lastModifiedTime;
+    bool m_lastModifiedTimeHasBeenSet = false;
+
+    Aws::String m_lastModifiedRegion;
+    bool m_lastModifiedRegionHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/CompleteAttachedFileUploadRequest.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/CompleteAttachedFileUploadRequest.h
index 199975879e7..5270c27f2f4 100644
--- a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/CompleteAttachedFileUploadRequest.h
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/CompleteAttachedFileUploadRequest.h
@@ -43,7 +43,7 @@ namespace Model
 
     ///@{
     /**
-     * <p>The unique identifier of the Connect instance.</p>
+     * <p>The unique identifier of the Amazon Connect instance.</p>
      */
     inline const Aws::String& GetInstanceId() const{ return m_instanceId; }
     inline bool InstanceIdHasBeenSet() const { return m_instanceIdHasBeenSet; }
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/DescribeAuthenticationProfileRequest.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/DescribeAuthenticationProfileRequest.h
new file mode 100644
index 00000000000..ead66118aa1
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/DescribeAuthenticationProfileRequest.h
@@ -0,0 +1,75 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/connect/Connect_EXPORTS.h>
+#include <aws/connect/ConnectRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Connect
+{
+namespace Model
+{
+
+  /**
+   */
+  class DescribeAuthenticationProfileRequest : public ConnectRequest
+  {
+  public:
+    AWS_CONNECT_API DescribeAuthenticationProfileRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "DescribeAuthenticationProfile"; }
+
+    AWS_CONNECT_API Aws::String SerializePayload() const override;
+
+
+    ///@{
+    /**
+     * <p>A unique identifier for the authentication profile. </p>
+     */
+    inline const Aws::String& GetAuthenticationProfileId() const{ return m_authenticationProfileId; }
+    inline bool AuthenticationProfileIdHasBeenSet() const { return m_authenticationProfileIdHasBeenSet; }
+    inline void SetAuthenticationProfileId(const Aws::String& value) { m_authenticationProfileIdHasBeenSet = true; m_authenticationProfileId = value; }
+    inline void SetAuthenticationProfileId(Aws::String&& value) { m_authenticationProfileIdHasBeenSet = true; m_authenticationProfileId = std::move(value); }
+    inline void SetAuthenticationProfileId(const char* value) { m_authenticationProfileIdHasBeenSet = true; m_authenticationProfileId.assign(value); }
+    inline DescribeAuthenticationProfileRequest& WithAuthenticationProfileId(const Aws::String& value) { SetAuthenticationProfileId(value); return *this;}
+    inline DescribeAuthenticationProfileRequest& WithAuthenticationProfileId(Aws::String&& value) { SetAuthenticationProfileId(std::move(value)); return *this;}
+    inline DescribeAuthenticationProfileRequest& WithAuthenticationProfileId(const char* value) { SetAuthenticationProfileId(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The identifier of the Amazon Connect instance. You can <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html">find
+     * the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>
+     */
+    inline const Aws::String& GetInstanceId() const{ return m_instanceId; }
+    inline bool InstanceIdHasBeenSet() const { return m_instanceIdHasBeenSet; }
+    inline void SetInstanceId(const Aws::String& value) { m_instanceIdHasBeenSet = true; m_instanceId = value; }
+    inline void SetInstanceId(Aws::String&& value) { m_instanceIdHasBeenSet = true; m_instanceId = std::move(value); }
+    inline void SetInstanceId(const char* value) { m_instanceIdHasBeenSet = true; m_instanceId.assign(value); }
+    inline DescribeAuthenticationProfileRequest& WithInstanceId(const Aws::String& value) { SetInstanceId(value); return *this;}
+    inline DescribeAuthenticationProfileRequest& WithInstanceId(Aws::String&& value) { SetInstanceId(std::move(value)); return *this;}
+    inline DescribeAuthenticationProfileRequest& WithInstanceId(const char* value) { SetInstanceId(value); return *this;}
+    ///@}
+  private:
+
+    Aws::String m_authenticationProfileId;
+    bool m_authenticationProfileIdHasBeenSet = false;
+
+    Aws::String m_instanceId;
+    bool m_instanceIdHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/DescribeAuthenticationProfileResult.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/DescribeAuthenticationProfileResult.h
new file mode 100644
index 00000000000..8bd4e99f09f
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/DescribeAuthenticationProfileResult.h
@@ -0,0 +1,66 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/connect/Connect_EXPORTS.h>
+#include <aws/connect/model/AuthenticationProfile.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace Connect
+{
+namespace Model
+{
+  class DescribeAuthenticationProfileResult
+  {
+  public:
+    AWS_CONNECT_API DescribeAuthenticationProfileResult();
+    AWS_CONNECT_API DescribeAuthenticationProfileResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_CONNECT_API DescribeAuthenticationProfileResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    ///@{
+    /**
+     * <p>The authentication profile object being described.</p>
+     */
+    inline const AuthenticationProfile& GetAuthenticationProfile() const{ return m_authenticationProfile; }
+    inline void SetAuthenticationProfile(const AuthenticationProfile& value) { m_authenticationProfile = value; }
+    inline void SetAuthenticationProfile(AuthenticationProfile&& value) { m_authenticationProfile = std::move(value); }
+    inline DescribeAuthenticationProfileResult& WithAuthenticationProfile(const AuthenticationProfile& value) { SetAuthenticationProfile(value); return *this;}
+    inline DescribeAuthenticationProfileResult& WithAuthenticationProfile(AuthenticationProfile&& value) { SetAuthenticationProfile(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+    inline DescribeAuthenticationProfileResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+    inline DescribeAuthenticationProfileResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+    inline DescribeAuthenticationProfileResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+    ///@}
+  private:
+
+    AuthenticationProfile m_authenticationProfile;
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/ListAuthenticationProfilesRequest.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/ListAuthenticationProfilesRequest.h
new file mode 100644
index 00000000000..129723a1c87
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/ListAuthenticationProfilesRequest.h
@@ -0,0 +1,95 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/connect/Connect_EXPORTS.h>
+#include <aws/connect/ConnectRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Http
+{
+    class URI;
+} //namespace Http
+namespace Connect
+{
+namespace Model
+{
+
+  /**
+   */
+  class ListAuthenticationProfilesRequest : public ConnectRequest
+  {
+  public:
+    AWS_CONNECT_API ListAuthenticationProfilesRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "ListAuthenticationProfiles"; }
+
+    AWS_CONNECT_API Aws::String SerializePayload() const override;
+
+    AWS_CONNECT_API void AddQueryStringParameters(Aws::Http::URI& uri) const override;
+
+
+    ///@{
+    /**
+     * <p>The identifier of the Amazon Connect instance. You can <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html">find
+     * the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>
+     */
+    inline const Aws::String& GetInstanceId() const{ return m_instanceId; }
+    inline bool InstanceIdHasBeenSet() const { return m_instanceIdHasBeenSet; }
+    inline void SetInstanceId(const Aws::String& value) { m_instanceIdHasBeenSet = true; m_instanceId = value; }
+    inline void SetInstanceId(Aws::String&& value) { m_instanceIdHasBeenSet = true; m_instanceId = std::move(value); }
+    inline void SetInstanceId(const char* value) { m_instanceIdHasBeenSet = true; m_instanceId.assign(value); }
+    inline ListAuthenticationProfilesRequest& WithInstanceId(const Aws::String& value) { SetInstanceId(value); return *this;}
+    inline ListAuthenticationProfilesRequest& WithInstanceId(Aws::String&& value) { SetInstanceId(std::move(value)); return *this;}
+    inline ListAuthenticationProfilesRequest& WithInstanceId(const char* value) { SetInstanceId(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The maximum number of results to return per page.</p>
+     */
+    inline int GetMaxResults() const{ return m_maxResults; }
+    inline bool MaxResultsHasBeenSet() const { return m_maxResultsHasBeenSet; }
+    inline void SetMaxResults(int value) { m_maxResultsHasBeenSet = true; m_maxResults = value; }
+    inline ListAuthenticationProfilesRequest& WithMaxResults(int value) { SetMaxResults(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The token for the next set of results. Use the value returned in the previous
+     * response in the next request to retrieve the next set of results.</p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+    inline bool NextTokenHasBeenSet() const { return m_nextTokenHasBeenSet; }
+    inline void SetNextToken(const Aws::String& value) { m_nextTokenHasBeenSet = true; m_nextToken = value; }
+    inline void SetNextToken(Aws::String&& value) { m_nextTokenHasBeenSet = true; m_nextToken = std::move(value); }
+    inline void SetNextToken(const char* value) { m_nextTokenHasBeenSet = true; m_nextToken.assign(value); }
+    inline ListAuthenticationProfilesRequest& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+    inline ListAuthenticationProfilesRequest& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+    inline ListAuthenticationProfilesRequest& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+    ///@}
+  private:
+
+    Aws::String m_instanceId;
+    bool m_instanceIdHasBeenSet = false;
+
+    int m_maxResults;
+    bool m_maxResultsHasBeenSet = false;
+
+    Aws::String m_nextToken;
+    bool m_nextTokenHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/ListAuthenticationProfilesResult.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/ListAuthenticationProfilesResult.h
new file mode 100644
index 00000000000..61862201ae2
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/ListAuthenticationProfilesResult.h
@@ -0,0 +1,85 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/connect/Connect_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/connect/model/AuthenticationProfileSummary.h>
+#include <utility>
+
+namespace Aws
+{
+template<typename RESULT_TYPE>
+class AmazonWebServiceResult;
+
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+} // namespace Json
+} // namespace Utils
+namespace Connect
+{
+namespace Model
+{
+  class ListAuthenticationProfilesResult
+  {
+  public:
+    AWS_CONNECT_API ListAuthenticationProfilesResult();
+    AWS_CONNECT_API ListAuthenticationProfilesResult(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+    AWS_CONNECT_API ListAuthenticationProfilesResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
+
+
+    ///@{
+    /**
+     * <p>A summary of a given authentication profile.</p>
+     */
+    inline const Aws::Vector<AuthenticationProfileSummary>& GetAuthenticationProfileSummaryList() const{ return m_authenticationProfileSummaryList; }
+    inline void SetAuthenticationProfileSummaryList(const Aws::Vector<AuthenticationProfileSummary>& value) { m_authenticationProfileSummaryList = value; }
+    inline void SetAuthenticationProfileSummaryList(Aws::Vector<AuthenticationProfileSummary>&& value) { m_authenticationProfileSummaryList = std::move(value); }
+    inline ListAuthenticationProfilesResult& WithAuthenticationProfileSummaryList(const Aws::Vector<AuthenticationProfileSummary>& value) { SetAuthenticationProfileSummaryList(value); return *this;}
+    inline ListAuthenticationProfilesResult& WithAuthenticationProfileSummaryList(Aws::Vector<AuthenticationProfileSummary>&& value) { SetAuthenticationProfileSummaryList(std::move(value)); return *this;}
+    inline ListAuthenticationProfilesResult& AddAuthenticationProfileSummaryList(const AuthenticationProfileSummary& value) { m_authenticationProfileSummaryList.push_back(value); return *this; }
+    inline ListAuthenticationProfilesResult& AddAuthenticationProfileSummaryList(AuthenticationProfileSummary&& value) { m_authenticationProfileSummaryList.push_back(std::move(value)); return *this; }
+    ///@}
+
+    ///@{
+    /**
+     * <p>If there are additional results, this is the token for the next set of
+     * results.</p>
+     */
+    inline const Aws::String& GetNextToken() const{ return m_nextToken; }
+    inline void SetNextToken(const Aws::String& value) { m_nextToken = value; }
+    inline void SetNextToken(Aws::String&& value) { m_nextToken = std::move(value); }
+    inline void SetNextToken(const char* value) { m_nextToken.assign(value); }
+    inline ListAuthenticationProfilesResult& WithNextToken(const Aws::String& value) { SetNextToken(value); return *this;}
+    inline ListAuthenticationProfilesResult& WithNextToken(Aws::String&& value) { SetNextToken(std::move(value)); return *this;}
+    inline ListAuthenticationProfilesResult& WithNextToken(const char* value) { SetNextToken(value); return *this;}
+    ///@}
+
+    ///@{
+    
+    inline const Aws::String& GetRequestId() const{ return m_requestId; }
+    inline void SetRequestId(const Aws::String& value) { m_requestId = value; }
+    inline void SetRequestId(Aws::String&& value) { m_requestId = std::move(value); }
+    inline void SetRequestId(const char* value) { m_requestId.assign(value); }
+    inline ListAuthenticationProfilesResult& WithRequestId(const Aws::String& value) { SetRequestId(value); return *this;}
+    inline ListAuthenticationProfilesResult& WithRequestId(Aws::String&& value) { SetRequestId(std::move(value)); return *this;}
+    inline ListAuthenticationProfilesResult& WithRequestId(const char* value) { SetRequestId(value); return *this;}
+    ///@}
+  private:
+
+    Aws::Vector<AuthenticationProfileSummary> m_authenticationProfileSummaryList;
+
+    Aws::String m_nextToken;
+
+    Aws::String m_requestId;
+  };
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/SearchContactFlowsResult.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/SearchContactFlowsResult.h
index 35707968426..4f440992833 100644
--- a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/SearchContactFlowsResult.h
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/SearchContactFlowsResult.h
@@ -36,7 +36,7 @@ namespace Model
 
     ///@{
     /**
-     * <p>Information about the contact flows.</p>
+     * <p>Information about the flows.</p>
      */
     inline const Aws::Vector<ContactFlow>& GetContactFlows() const{ return m_contactFlows; }
     inline void SetContactFlows(const Aws::Vector<ContactFlow>& value) { m_contactFlows = value; }
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartAttachedFileUploadRequest.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartAttachedFileUploadRequest.h
index 25cc9611860..dcb4e7f62bb 100644
--- a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartAttachedFileUploadRequest.h
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartAttachedFileUploadRequest.h
@@ -62,7 +62,7 @@ namespace Model
 
     ///@{
     /**
-     * <p>The unique identifier of the Connect instance.</p>
+     * <p>The unique identifier of the Amazon Connect instance.</p>
      */
     inline const Aws::String& GetInstanceId() const{ return m_instanceId; }
     inline bool InstanceIdHasBeenSet() const { return m_instanceIdHasBeenSet; }
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartWebRTCContactRequest.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartWebRTCContactRequest.h
index 5baa1f5b32a..db33a59fd16 100644
--- a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartWebRTCContactRequest.h
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/StartWebRTCContactRequest.h
@@ -83,9 +83,9 @@ namespace Model
     /**
      * <p>The identifier of the flow for the call. To see the ContactFlowId in the
      * Amazon Connect admin website, on the navigation menu go to <b>Routing</b>,
-     * <b>Contact Flows</b>. Choose the flow. On the flow page, under the name of the
-     * flow, choose <b>Show additional flow information</b>. The ContactFlowId is the
-     * last part of the ARN, shown here in bold: </p>
+     * <b>Flows</b>. Choose the flow. On the flow page, under the name of the flow,
+     * choose <b>Show additional flow information</b>. The ContactFlowId is the last
+     * part of the ARN, shown here in bold: </p>
      * <p>arn:aws:connect:us-west-2:xxxxxxxxxxxx:instance/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/contact-flow/<b>846ec553-a005-41c0-8341-xxxxxxxxxxxx</b>
      * </p>
      */
diff --git a/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/UpdateAuthenticationProfileRequest.h b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/UpdateAuthenticationProfileRequest.h
new file mode 100644
index 00000000000..1375682fb38
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/include/aws/connect/model/UpdateAuthenticationProfileRequest.h
@@ -0,0 +1,172 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/connect/Connect_EXPORTS.h>
+#include <aws/connect/ConnectRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Connect
+{
+namespace Model
+{
+
+  /**
+   */
+  class UpdateAuthenticationProfileRequest : public ConnectRequest
+  {
+  public:
+    AWS_CONNECT_API UpdateAuthenticationProfileRequest();
+
+    // Service request name is the Operation name which will send this request out,
+    // each operation should has unique request name, so that we can get operation's name from this request.
+    // Note: this is not true for response, multiple operations may have the same response name,
+    // so we can not get operation's name from response.
+    inline virtual const char* GetServiceRequestName() const override { return "UpdateAuthenticationProfile"; }
+
+    AWS_CONNECT_API Aws::String SerializePayload() const override;
+
+
+    ///@{
+    /**
+     * <p>A unique identifier for the authentication profile. </p>
+     */
+    inline const Aws::String& GetAuthenticationProfileId() const{ return m_authenticationProfileId; }
+    inline bool AuthenticationProfileIdHasBeenSet() const { return m_authenticationProfileIdHasBeenSet; }
+    inline void SetAuthenticationProfileId(const Aws::String& value) { m_authenticationProfileIdHasBeenSet = true; m_authenticationProfileId = value; }
+    inline void SetAuthenticationProfileId(Aws::String&& value) { m_authenticationProfileIdHasBeenSet = true; m_authenticationProfileId = std::move(value); }
+    inline void SetAuthenticationProfileId(const char* value) { m_authenticationProfileIdHasBeenSet = true; m_authenticationProfileId.assign(value); }
+    inline UpdateAuthenticationProfileRequest& WithAuthenticationProfileId(const Aws::String& value) { SetAuthenticationProfileId(value); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithAuthenticationProfileId(Aws::String&& value) { SetAuthenticationProfileId(std::move(value)); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithAuthenticationProfileId(const char* value) { SetAuthenticationProfileId(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The identifier of the Amazon Connect instance. You can <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html">find
+     * the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>
+     */
+    inline const Aws::String& GetInstanceId() const{ return m_instanceId; }
+    inline bool InstanceIdHasBeenSet() const { return m_instanceIdHasBeenSet; }
+    inline void SetInstanceId(const Aws::String& value) { m_instanceIdHasBeenSet = true; m_instanceId = value; }
+    inline void SetInstanceId(Aws::String&& value) { m_instanceIdHasBeenSet = true; m_instanceId = std::move(value); }
+    inline void SetInstanceId(const char* value) { m_instanceIdHasBeenSet = true; m_instanceId.assign(value); }
+    inline UpdateAuthenticationProfileRequest& WithInstanceId(const Aws::String& value) { SetInstanceId(value); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithInstanceId(Aws::String&& value) { SetInstanceId(std::move(value)); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithInstanceId(const char* value) { SetInstanceId(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The name for the authentication profile.</p>
+     */
+    inline const Aws::String& GetName() const{ return m_name; }
+    inline bool NameHasBeenSet() const { return m_nameHasBeenSet; }
+    inline void SetName(const Aws::String& value) { m_nameHasBeenSet = true; m_name = value; }
+    inline void SetName(Aws::String&& value) { m_nameHasBeenSet = true; m_name = std::move(value); }
+    inline void SetName(const char* value) { m_nameHasBeenSet = true; m_name.assign(value); }
+    inline UpdateAuthenticationProfileRequest& WithName(const Aws::String& value) { SetName(value); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithName(Aws::String&& value) { SetName(std::move(value)); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithName(const char* value) { SetName(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The description for the authentication profile.</p>
+     */
+    inline const Aws::String& GetDescription() const{ return m_description; }
+    inline bool DescriptionHasBeenSet() const { return m_descriptionHasBeenSet; }
+    inline void SetDescription(const Aws::String& value) { m_descriptionHasBeenSet = true; m_description = value; }
+    inline void SetDescription(Aws::String&& value) { m_descriptionHasBeenSet = true; m_description = std::move(value); }
+    inline void SetDescription(const char* value) { m_descriptionHasBeenSet = true; m_description.assign(value); }
+    inline UpdateAuthenticationProfileRequest& WithDescription(const Aws::String& value) { SetDescription(value); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithDescription(Aws::String&& value) { SetDescription(std::move(value)); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithDescription(const char* value) { SetDescription(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>A list of IP address range strings that are allowed to access the instance.
+     * For more information on how to configure IP addresses, see<a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts">Configure
+     * session timeouts</a> in the <i>Amazon Connect Administrator Guide</i>.</p>
+     */
+    inline const Aws::Vector<Aws::String>& GetAllowedIps() const{ return m_allowedIps; }
+    inline bool AllowedIpsHasBeenSet() const { return m_allowedIpsHasBeenSet; }
+    inline void SetAllowedIps(const Aws::Vector<Aws::String>& value) { m_allowedIpsHasBeenSet = true; m_allowedIps = value; }
+    inline void SetAllowedIps(Aws::Vector<Aws::String>&& value) { m_allowedIpsHasBeenSet = true; m_allowedIps = std::move(value); }
+    inline UpdateAuthenticationProfileRequest& WithAllowedIps(const Aws::Vector<Aws::String>& value) { SetAllowedIps(value); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithAllowedIps(Aws::Vector<Aws::String>&& value) { SetAllowedIps(std::move(value)); return *this;}
+    inline UpdateAuthenticationProfileRequest& AddAllowedIps(const Aws::String& value) { m_allowedIpsHasBeenSet = true; m_allowedIps.push_back(value); return *this; }
+    inline UpdateAuthenticationProfileRequest& AddAllowedIps(Aws::String&& value) { m_allowedIpsHasBeenSet = true; m_allowedIps.push_back(std::move(value)); return *this; }
+    inline UpdateAuthenticationProfileRequest& AddAllowedIps(const char* value) { m_allowedIpsHasBeenSet = true; m_allowedIps.push_back(value); return *this; }
+    ///@}
+
+    ///@{
+    /**
+     * <p>A list of IP address range strings that are blocked from accessing the
+     * instance. For more information on how to configure IP addresses, For more
+     * information on how to configure IP addresses, see <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-ip-based-ac">Configure
+     * IP-based access control</a> in the <i>Amazon Connect Administrator Guide</i>.
+     * </p>
+     */
+    inline const Aws::Vector<Aws::String>& GetBlockedIps() const{ return m_blockedIps; }
+    inline bool BlockedIpsHasBeenSet() const { return m_blockedIpsHasBeenSet; }
+    inline void SetBlockedIps(const Aws::Vector<Aws::String>& value) { m_blockedIpsHasBeenSet = true; m_blockedIps = value; }
+    inline void SetBlockedIps(Aws::Vector<Aws::String>&& value) { m_blockedIpsHasBeenSet = true; m_blockedIps = std::move(value); }
+    inline UpdateAuthenticationProfileRequest& WithBlockedIps(const Aws::Vector<Aws::String>& value) { SetBlockedIps(value); return *this;}
+    inline UpdateAuthenticationProfileRequest& WithBlockedIps(Aws::Vector<Aws::String>&& value) { SetBlockedIps(std::move(value)); return *this;}
+    inline UpdateAuthenticationProfileRequest& AddBlockedIps(const Aws::String& value) { m_blockedIpsHasBeenSet = true; m_blockedIps.push_back(value); return *this; }
+    inline UpdateAuthenticationProfileRequest& AddBlockedIps(Aws::String&& value) { m_blockedIpsHasBeenSet = true; m_blockedIps.push_back(std::move(value)); return *this; }
+    inline UpdateAuthenticationProfileRequest& AddBlockedIps(const char* value) { m_blockedIpsHasBeenSet = true; m_blockedIps.push_back(value); return *this; }
+    ///@}
+
+    ///@{
+    /**
+     * <p>The short lived session duration configuration for users logged in to Amazon
+     * Connect, in minutes. This value determines the maximum possible time before an
+     * agent is authenticated. For more information, For more information on how to
+     * configure IP addresses, see <a
+     * href="https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts">Configure
+     * session timeouts</a> in the <i>Amazon Connect Administrator Guide</i>. </p>
+     */
+    inline int GetPeriodicSessionDuration() const{ return m_periodicSessionDuration; }
+    inline bool PeriodicSessionDurationHasBeenSet() const { return m_periodicSessionDurationHasBeenSet; }
+    inline void SetPeriodicSessionDuration(int value) { m_periodicSessionDurationHasBeenSet = true; m_periodicSessionDuration = value; }
+    inline UpdateAuthenticationProfileRequest& WithPeriodicSessionDuration(int value) { SetPeriodicSessionDuration(value); return *this;}
+    ///@}
+  private:
+
+    Aws::String m_authenticationProfileId;
+    bool m_authenticationProfileIdHasBeenSet = false;
+
+    Aws::String m_instanceId;
+    bool m_instanceIdHasBeenSet = false;
+
+    Aws::String m_name;
+    bool m_nameHasBeenSet = false;
+
+    Aws::String m_description;
+    bool m_descriptionHasBeenSet = false;
+
+    Aws::Vector<Aws::String> m_allowedIps;
+    bool m_allowedIpsHasBeenSet = false;
+
+    Aws::Vector<Aws::String> m_blockedIps;
+    bool m_blockedIpsHasBeenSet = false;
+
+    int m_periodicSessionDuration;
+    bool m_periodicSessionDurationHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/source/ConnectClient.cpp b/generated/src/aws-cpp-sdk-connect/source/ConnectClient.cpp
index fa625b2bfc3..3fcca39425e 100644
--- a/generated/src/aws-cpp-sdk-connect/source/ConnectClient.cpp
+++ b/generated/src/aws-cpp-sdk-connect/source/ConnectClient.cpp
@@ -66,7 +66,6 @@
 #include <aws/connect/model/CreatePersistentContactAssociationRequest.h>
 #include <aws/connect/model/DeleteContactEvaluationRequest.h>
 #include <aws/connect/model/CreateQuickConnectRequest.h>
-#include <aws/connect/model/DisassociateLambdaFunctionRequest.h>
 #include <aws/connect/model/DeleteInstanceRequest.h>
 #include <aws/connect/model/DescribePromptRequest.h>
 #include <aws/connect/model/CreateInstanceRequest.h>
@@ -84,6 +83,7 @@
 #include <aws/connect/model/CreateIntegrationAssociationRequest.h>
 #include <aws/connect/model/DeleteRoutingProfileRequest.h>
 #include <aws/connect/model/DescribePhoneNumberRequest.h>
+#include <aws/connect/model/DescribeAuthenticationProfileRequest.h>
 #include <aws/connect/model/AssociateApprovedOriginRequest.h>
 #include <aws/connect/model/AssociateAnalyticsDataSetRequest.h>
 #include <aws/connect/model/DescribeViewRequest.h>
@@ -1914,45 +1914,6 @@ CreateQuickConnectOutcome ConnectClient::CreateQuickConnect(const CreateQuickCon
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-DisassociateLambdaFunctionOutcome ConnectClient::DisassociateLambdaFunction(const DisassociateLambdaFunctionRequest& request) const
-{
-  AWS_OPERATION_GUARD(DisassociateLambdaFunction);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, DisassociateLambdaFunction, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  if (!request.InstanceIdHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("DisassociateLambdaFunction", "Required field: InstanceId, is not set");
-    return DisassociateLambdaFunctionOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [InstanceId]", false));
-  }
-  if (!request.FunctionArnHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("DisassociateLambdaFunction", "Required field: FunctionArn, is not set");
-    return DisassociateLambdaFunctionOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [FunctionArn]", false));
-  }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, DisassociateLambdaFunction, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, DisassociateLambdaFunction, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".DisassociateLambdaFunction",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<DisassociateLambdaFunctionOutcome>(
-    [&]()-> DisassociateLambdaFunctionOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, DisassociateLambdaFunction, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/instance/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetInstanceId());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/lambda-function");
-      return DisassociateLambdaFunctionOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_DELETE, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 DeleteInstanceOutcome ConnectClient::DeleteInstance(const DeleteInstanceRequest& request) const
 {
   AWS_OPERATION_GUARD(DeleteInstance);
@@ -2575,6 +2536,45 @@ DescribePhoneNumberOutcome ConnectClient::DescribePhoneNumber(const DescribePhon
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+DescribeAuthenticationProfileOutcome ConnectClient::DescribeAuthenticationProfile(const DescribeAuthenticationProfileRequest& request) const
+{
+  AWS_OPERATION_GUARD(DescribeAuthenticationProfile);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, DescribeAuthenticationProfile, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.AuthenticationProfileIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DescribeAuthenticationProfile", "Required field: AuthenticationProfileId, is not set");
+    return DescribeAuthenticationProfileOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [AuthenticationProfileId]", false));
+  }
+  if (!request.InstanceIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DescribeAuthenticationProfile", "Required field: InstanceId, is not set");
+    return DescribeAuthenticationProfileOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [InstanceId]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, DescribeAuthenticationProfile, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, DescribeAuthenticationProfile, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".DescribeAuthenticationProfile",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<DescribeAuthenticationProfileOutcome>(
+    [&]()-> DescribeAuthenticationProfileOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, DescribeAuthenticationProfile, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/authentication-profiles/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetInstanceId());
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetAuthenticationProfileId());
+      return DescribeAuthenticationProfileOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 AssociateApprovedOriginOutcome ConnectClient::AssociateApprovedOrigin(const AssociateApprovedOriginRequest& request) const
 {
   AWS_OPERATION_GUARD(AssociateApprovedOrigin);
diff --git a/generated/src/aws-cpp-sdk-connect/source/ConnectClient1.cpp b/generated/src/aws-cpp-sdk-connect/source/ConnectClient1.cpp
index 6e32346e1b8..446a797da49 100644
--- a/generated/src/aws-cpp-sdk-connect/source/ConnectClient1.cpp
+++ b/generated/src/aws-cpp-sdk-connect/source/ConnectClient1.cpp
@@ -57,8 +57,8 @@
 #include <aws/connect/model/ListApprovedOriginsRequest.h>
 #include <aws/connect/model/ListRealtimeContactAnalysisSegmentsV2Request.h>
 #include <aws/connect/model/ListTagsForResourceRequest.h>
+#include <aws/connect/model/ListAuthenticationProfilesRequest.h>
 #include <aws/connect/model/SearchSecurityProfilesRequest.h>
-#include <aws/connect/model/SuspendContactRecordingRequest.h>
 #include <aws/connect/model/ListDefaultVocabulariesRequest.h>
 #include <aws/connect/model/SearchVocabulariesRequest.h>
 #include <aws/connect/model/SearchRoutingProfilesRequest.h>
@@ -79,6 +79,7 @@
 #include <aws/connect/model/SearchAvailablePhoneNumbersRequest.h>
 #include <aws/connect/model/StartTaskContactRequest.h>
 #include <aws/connect/model/ListContactFlowsRequest.h>
+#include <aws/connect/model/DisassociateLambdaFunctionRequest.h>
 #include <aws/connect/model/StopContactStreamingRequest.h>
 #include <aws/connect/model/ListIntegrationAssociationsRequest.h>
 #include <aws/connect/model/ImportPhoneNumberRequest.h>
@@ -99,7 +100,6 @@
 #include <aws/connect/model/ListQuickConnectsRequest.h>
 #include <aws/connect/model/DisassociateQueueQuickConnectsRequest.h>
 #include <aws/connect/model/SearchContactsRequest.h>
-#include <aws/connect/model/TagContactRequest.h>
 #include <aws/connect/model/GetTrafficDistributionRequest.h>
 #include <aws/connect/model/ListEvaluationFormVersionsRequest.h>
 #include <aws/connect/model/ListQueuesRequest.h>
@@ -1342,54 +1342,60 @@ ListTagsForResourceOutcome ConnectClient::ListTagsForResource(const ListTagsForR
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-SearchSecurityProfilesOutcome ConnectClient::SearchSecurityProfiles(const SearchSecurityProfilesRequest& request) const
+ListAuthenticationProfilesOutcome ConnectClient::ListAuthenticationProfiles(const ListAuthenticationProfilesRequest& request) const
 {
-  AWS_OPERATION_GUARD(SearchSecurityProfiles);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, SearchSecurityProfiles, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, SearchSecurityProfiles, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  AWS_OPERATION_GUARD(ListAuthenticationProfiles);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, ListAuthenticationProfiles, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.InstanceIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("ListAuthenticationProfiles", "Required field: InstanceId, is not set");
+    return ListAuthenticationProfilesOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [InstanceId]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, ListAuthenticationProfiles, CoreErrors, CoreErrors::NOT_INITIALIZED);
   auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
   auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, SearchSecurityProfiles, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".SearchSecurityProfiles",
+  AWS_OPERATION_CHECK_PTR(meter, ListAuthenticationProfiles, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".ListAuthenticationProfiles",
     {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
     smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<SearchSecurityProfilesOutcome>(
-    [&]()-> SearchSecurityProfilesOutcome {
+  return TracingUtils::MakeCallWithTiming<ListAuthenticationProfilesOutcome>(
+    [&]()-> ListAuthenticationProfilesOutcome {
       auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
           [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
           TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
           *meter,
           {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, SearchSecurityProfiles, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/search-security-profiles");
-      return SearchSecurityProfilesOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ListAuthenticationProfiles, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/authentication-profiles-summary/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetInstanceId());
+      return ListAuthenticationProfilesOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
     },
     TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
     *meter,
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-SuspendContactRecordingOutcome ConnectClient::SuspendContactRecording(const SuspendContactRecordingRequest& request) const
+SearchSecurityProfilesOutcome ConnectClient::SearchSecurityProfiles(const SearchSecurityProfilesRequest& request) const
 {
-  AWS_OPERATION_GUARD(SuspendContactRecording);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, SuspendContactRecording, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, SuspendContactRecording, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  AWS_OPERATION_GUARD(SearchSecurityProfiles);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, SearchSecurityProfiles, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, SearchSecurityProfiles, CoreErrors, CoreErrors::NOT_INITIALIZED);
   auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
   auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, SuspendContactRecording, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".SuspendContactRecording",
+  AWS_OPERATION_CHECK_PTR(meter, SearchSecurityProfiles, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".SearchSecurityProfiles",
     {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
     smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<SuspendContactRecordingOutcome>(
-    [&]()-> SuspendContactRecordingOutcome {
+  return TracingUtils::MakeCallWithTiming<SearchSecurityProfilesOutcome>(
+    [&]()-> SearchSecurityProfilesOutcome {
       auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
           [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
           TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
           *meter,
           {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, SuspendContactRecording, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/contact/suspend-recording");
-      return SuspendContactRecordingOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, SearchSecurityProfiles, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/search-security-profiles");
+      return SearchSecurityProfilesOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
     },
     TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
     *meter,
@@ -2041,6 +2047,45 @@ ListContactFlowsOutcome ConnectClient::ListContactFlows(const ListContactFlowsRe
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+DisassociateLambdaFunctionOutcome ConnectClient::DisassociateLambdaFunction(const DisassociateLambdaFunctionRequest& request) const
+{
+  AWS_OPERATION_GUARD(DisassociateLambdaFunction);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, DisassociateLambdaFunction, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.InstanceIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DisassociateLambdaFunction", "Required field: InstanceId, is not set");
+    return DisassociateLambdaFunctionOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [InstanceId]", false));
+  }
+  if (!request.FunctionArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DisassociateLambdaFunction", "Required field: FunctionArn, is not set");
+    return DisassociateLambdaFunctionOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [FunctionArn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, DisassociateLambdaFunction, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, DisassociateLambdaFunction, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".DisassociateLambdaFunction",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<DisassociateLambdaFunctionOutcome>(
+    [&]()-> DisassociateLambdaFunctionOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, DisassociateLambdaFunction, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/instance/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetInstanceId());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/lambda-function");
+      return DisassociateLambdaFunctionOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_DELETE, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 StopContactStreamingOutcome ConnectClient::StopContactStreaming(const StopContactStreamingRequest& request) const
 {
   AWS_OPERATION_GUARD(StopContactStreaming);
@@ -2688,33 +2733,6 @@ SearchContactsOutcome ConnectClient::SearchContacts(const SearchContactsRequest&
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-TagContactOutcome ConnectClient::TagContact(const TagContactRequest& request) const
-{
-  AWS_OPERATION_GUARD(TagContact);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, TagContact, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, TagContact, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, TagContact, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".TagContact",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<TagContactOutcome>(
-    [&]()-> TagContactOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, TagContact, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/contact/tags");
-      return TagContactOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 GetTrafficDistributionOutcome ConnectClient::GetTrafficDistribution(const GetTrafficDistributionRequest& request) const
 {
   AWS_OPERATION_GUARD(GetTrafficDistribution);
diff --git a/generated/src/aws-cpp-sdk-connect/source/ConnectClient2.cpp b/generated/src/aws-cpp-sdk-connect/source/ConnectClient2.cpp
index c9c0b73e92b..fffae42e2b9 100644
--- a/generated/src/aws-cpp-sdk-connect/source/ConnectClient2.cpp
+++ b/generated/src/aws-cpp-sdk-connect/source/ConnectClient2.cpp
@@ -49,9 +49,12 @@
 #include <aws/connect/model/UpdateQuickConnectNameRequest.h>
 #include <aws/connect/model/UpdateContactFlowNameRequest.h>
 #include <aws/connect/model/TagResourceRequest.h>
+#include <aws/connect/model/TagContactRequest.h>
 #include <aws/connect/model/UpdatePredefinedAttributeRequest.h>
 #include <aws/connect/model/UpdateContactFlowModuleContentRequest.h>
+#include <aws/connect/model/SuspendContactRecordingRequest.h>
 #include <aws/connect/model/UpdateContactEvaluationRequest.h>
+#include <aws/connect/model/UpdateAuthenticationProfileRequest.h>
 #include <aws/connect/model/UpdateUserHierarchyStructureRequest.h>
 #include <aws/connect/model/UpdateQueueMaxContactsRequest.h>
 #include <aws/connect/model/UpdateRoutingProfileNameRequest.h>
@@ -1162,6 +1165,33 @@ TagResourceOutcome ConnectClient::TagResource(const TagResourceRequest& request)
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+TagContactOutcome ConnectClient::TagContact(const TagContactRequest& request) const
+{
+  AWS_OPERATION_GUARD(TagContact);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, TagContact, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, TagContact, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, TagContact, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".TagContact",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<TagContactOutcome>(
+    [&]()-> TagContactOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, TagContact, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/contact/tags");
+      return TagContactOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 UpdatePredefinedAttributeOutcome ConnectClient::UpdatePredefinedAttribute(const UpdatePredefinedAttributeRequest& request) const
 {
   AWS_OPERATION_GUARD(UpdatePredefinedAttribute);
@@ -1241,6 +1271,33 @@ UpdateContactFlowModuleContentOutcome ConnectClient::UpdateContactFlowModuleCont
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+SuspendContactRecordingOutcome ConnectClient::SuspendContactRecording(const SuspendContactRecordingRequest& request) const
+{
+  AWS_OPERATION_GUARD(SuspendContactRecording);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, SuspendContactRecording, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, SuspendContactRecording, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, SuspendContactRecording, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".SuspendContactRecording",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<SuspendContactRecordingOutcome>(
+    [&]()-> SuspendContactRecordingOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, SuspendContactRecording, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/contact/suspend-recording");
+      return SuspendContactRecordingOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 UpdateContactEvaluationOutcome ConnectClient::UpdateContactEvaluation(const UpdateContactEvaluationRequest& request) const
 {
   AWS_OPERATION_GUARD(UpdateContactEvaluation);
@@ -1280,6 +1337,45 @@ UpdateContactEvaluationOutcome ConnectClient::UpdateContactEvaluation(const Upda
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+UpdateAuthenticationProfileOutcome ConnectClient::UpdateAuthenticationProfile(const UpdateAuthenticationProfileRequest& request) const
+{
+  AWS_OPERATION_GUARD(UpdateAuthenticationProfile);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateAuthenticationProfile, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.AuthenticationProfileIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("UpdateAuthenticationProfile", "Required field: AuthenticationProfileId, is not set");
+    return UpdateAuthenticationProfileOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [AuthenticationProfileId]", false));
+  }
+  if (!request.InstanceIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("UpdateAuthenticationProfile", "Required field: InstanceId, is not set");
+    return UpdateAuthenticationProfileOutcome(Aws::Client::AWSError<ConnectErrors>(ConnectErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [InstanceId]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateAuthenticationProfile, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, UpdateAuthenticationProfile, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateAuthenticationProfile",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<UpdateAuthenticationProfileOutcome>(
+    [&]()-> UpdateAuthenticationProfileOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateAuthenticationProfile, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/authentication-profiles/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetInstanceId());
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetAuthenticationProfileId());
+      return UpdateAuthenticationProfileOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 UpdateUserHierarchyStructureOutcome ConnectClient::UpdateUserHierarchyStructure(const UpdateUserHierarchyStructureRequest& request) const
 {
   AWS_OPERATION_GUARD(UpdateUserHierarchyStructure);
diff --git a/generated/src/aws-cpp-sdk-connect/source/model/AuthenticationProfile.cpp b/generated/src/aws-cpp-sdk-connect/source/model/AuthenticationProfile.cpp
new file mode 100644
index 00000000000..c801a11805d
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/source/model/AuthenticationProfile.cpp
@@ -0,0 +1,230 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/connect/model/AuthenticationProfile.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace Connect
+{
+namespace Model
+{
+
+AuthenticationProfile::AuthenticationProfile() : 
+    m_idHasBeenSet(false),
+    m_arnHasBeenSet(false),
+    m_nameHasBeenSet(false),
+    m_descriptionHasBeenSet(false),
+    m_allowedIpsHasBeenSet(false),
+    m_blockedIpsHasBeenSet(false),
+    m_isDefault(false),
+    m_isDefaultHasBeenSet(false),
+    m_createdTimeHasBeenSet(false),
+    m_lastModifiedTimeHasBeenSet(false),
+    m_lastModifiedRegionHasBeenSet(false),
+    m_periodicSessionDuration(0),
+    m_periodicSessionDurationHasBeenSet(false),
+    m_maxSessionDuration(0),
+    m_maxSessionDurationHasBeenSet(false)
+{
+}
+
+AuthenticationProfile::AuthenticationProfile(JsonView jsonValue)
+  : AuthenticationProfile()
+{
+  *this = jsonValue;
+}
+
+AuthenticationProfile& AuthenticationProfile::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("Id"))
+  {
+    m_id = jsonValue.GetString("Id");
+
+    m_idHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Arn"))
+  {
+    m_arn = jsonValue.GetString("Arn");
+
+    m_arnHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Name"))
+  {
+    m_name = jsonValue.GetString("Name");
+
+    m_nameHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Description"))
+  {
+    m_description = jsonValue.GetString("Description");
+
+    m_descriptionHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("AllowedIps"))
+  {
+    Aws::Utils::Array<JsonView> allowedIpsJsonList = jsonValue.GetArray("AllowedIps");
+    for(unsigned allowedIpsIndex = 0; allowedIpsIndex < allowedIpsJsonList.GetLength(); ++allowedIpsIndex)
+    {
+      m_allowedIps.push_back(allowedIpsJsonList[allowedIpsIndex].AsString());
+    }
+    m_allowedIpsHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("BlockedIps"))
+  {
+    Aws::Utils::Array<JsonView> blockedIpsJsonList = jsonValue.GetArray("BlockedIps");
+    for(unsigned blockedIpsIndex = 0; blockedIpsIndex < blockedIpsJsonList.GetLength(); ++blockedIpsIndex)
+    {
+      m_blockedIps.push_back(blockedIpsJsonList[blockedIpsIndex].AsString());
+    }
+    m_blockedIpsHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("IsDefault"))
+  {
+    m_isDefault = jsonValue.GetBool("IsDefault");
+
+    m_isDefaultHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("CreatedTime"))
+  {
+    m_createdTime = jsonValue.GetDouble("CreatedTime");
+
+    m_createdTimeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("LastModifiedTime"))
+  {
+    m_lastModifiedTime = jsonValue.GetDouble("LastModifiedTime");
+
+    m_lastModifiedTimeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("LastModifiedRegion"))
+  {
+    m_lastModifiedRegion = jsonValue.GetString("LastModifiedRegion");
+
+    m_lastModifiedRegionHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("PeriodicSessionDuration"))
+  {
+    m_periodicSessionDuration = jsonValue.GetInteger("PeriodicSessionDuration");
+
+    m_periodicSessionDurationHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("MaxSessionDuration"))
+  {
+    m_maxSessionDuration = jsonValue.GetInteger("MaxSessionDuration");
+
+    m_maxSessionDurationHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue AuthenticationProfile::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_idHasBeenSet)
+  {
+   payload.WithString("Id", m_id);
+
+  }
+
+  if(m_arnHasBeenSet)
+  {
+   payload.WithString("Arn", m_arn);
+
+  }
+
+  if(m_nameHasBeenSet)
+  {
+   payload.WithString("Name", m_name);
+
+  }
+
+  if(m_descriptionHasBeenSet)
+  {
+   payload.WithString("Description", m_description);
+
+  }
+
+  if(m_allowedIpsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> allowedIpsJsonList(m_allowedIps.size());
+   for(unsigned allowedIpsIndex = 0; allowedIpsIndex < allowedIpsJsonList.GetLength(); ++allowedIpsIndex)
+   {
+     allowedIpsJsonList[allowedIpsIndex].AsString(m_allowedIps[allowedIpsIndex]);
+   }
+   payload.WithArray("AllowedIps", std::move(allowedIpsJsonList));
+
+  }
+
+  if(m_blockedIpsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> blockedIpsJsonList(m_blockedIps.size());
+   for(unsigned blockedIpsIndex = 0; blockedIpsIndex < blockedIpsJsonList.GetLength(); ++blockedIpsIndex)
+   {
+     blockedIpsJsonList[blockedIpsIndex].AsString(m_blockedIps[blockedIpsIndex]);
+   }
+   payload.WithArray("BlockedIps", std::move(blockedIpsJsonList));
+
+  }
+
+  if(m_isDefaultHasBeenSet)
+  {
+   payload.WithBool("IsDefault", m_isDefault);
+
+  }
+
+  if(m_createdTimeHasBeenSet)
+  {
+   payload.WithDouble("CreatedTime", m_createdTime.SecondsWithMSPrecision());
+  }
+
+  if(m_lastModifiedTimeHasBeenSet)
+  {
+   payload.WithDouble("LastModifiedTime", m_lastModifiedTime.SecondsWithMSPrecision());
+  }
+
+  if(m_lastModifiedRegionHasBeenSet)
+  {
+   payload.WithString("LastModifiedRegion", m_lastModifiedRegion);
+
+  }
+
+  if(m_periodicSessionDurationHasBeenSet)
+  {
+   payload.WithInteger("PeriodicSessionDuration", m_periodicSessionDuration);
+
+  }
+
+  if(m_maxSessionDurationHasBeenSet)
+  {
+   payload.WithInteger("MaxSessionDuration", m_maxSessionDuration);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/source/model/AuthenticationProfileSummary.cpp b/generated/src/aws-cpp-sdk-connect/source/model/AuthenticationProfileSummary.cpp
new file mode 100644
index 00000000000..31a90799758
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/source/model/AuthenticationProfileSummary.cpp
@@ -0,0 +1,129 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/connect/model/AuthenticationProfileSummary.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace Connect
+{
+namespace Model
+{
+
+AuthenticationProfileSummary::AuthenticationProfileSummary() : 
+    m_idHasBeenSet(false),
+    m_arnHasBeenSet(false),
+    m_nameHasBeenSet(false),
+    m_isDefault(false),
+    m_isDefaultHasBeenSet(false),
+    m_lastModifiedTimeHasBeenSet(false),
+    m_lastModifiedRegionHasBeenSet(false)
+{
+}
+
+AuthenticationProfileSummary::AuthenticationProfileSummary(JsonView jsonValue)
+  : AuthenticationProfileSummary()
+{
+  *this = jsonValue;
+}
+
+AuthenticationProfileSummary& AuthenticationProfileSummary::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("Id"))
+  {
+    m_id = jsonValue.GetString("Id");
+
+    m_idHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Arn"))
+  {
+    m_arn = jsonValue.GetString("Arn");
+
+    m_arnHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Name"))
+  {
+    m_name = jsonValue.GetString("Name");
+
+    m_nameHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("IsDefault"))
+  {
+    m_isDefault = jsonValue.GetBool("IsDefault");
+
+    m_isDefaultHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("LastModifiedTime"))
+  {
+    m_lastModifiedTime = jsonValue.GetDouble("LastModifiedTime");
+
+    m_lastModifiedTimeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("LastModifiedRegion"))
+  {
+    m_lastModifiedRegion = jsonValue.GetString("LastModifiedRegion");
+
+    m_lastModifiedRegionHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue AuthenticationProfileSummary::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_idHasBeenSet)
+  {
+   payload.WithString("Id", m_id);
+
+  }
+
+  if(m_arnHasBeenSet)
+  {
+   payload.WithString("Arn", m_arn);
+
+  }
+
+  if(m_nameHasBeenSet)
+  {
+   payload.WithString("Name", m_name);
+
+  }
+
+  if(m_isDefaultHasBeenSet)
+  {
+   payload.WithBool("IsDefault", m_isDefault);
+
+  }
+
+  if(m_lastModifiedTimeHasBeenSet)
+  {
+   payload.WithDouble("LastModifiedTime", m_lastModifiedTime.SecondsWithMSPrecision());
+  }
+
+  if(m_lastModifiedRegionHasBeenSet)
+  {
+   payload.WithString("LastModifiedRegion", m_lastModifiedRegion);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace Connect
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-connect/source/model/DescribeAuthenticationProfileRequest.cpp b/generated/src/aws-cpp-sdk-connect/source/model/DescribeAuthenticationProfileRequest.cpp
new file mode 100644
index 00000000000..336ee562836
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/source/model/DescribeAuthenticationProfileRequest.cpp
@@ -0,0 +1,28 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/connect/model/DescribeAuthenticationProfileRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Connect::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+DescribeAuthenticationProfileRequest::DescribeAuthenticationProfileRequest() : 
+    m_authenticationProfileIdHasBeenSet(false),
+    m_instanceIdHasBeenSet(false)
+{
+}
+
+Aws::String DescribeAuthenticationProfileRequest::SerializePayload() const
+{
+  return {};
+}
+
+
+
+
diff --git a/generated/src/aws-cpp-sdk-connect/source/model/DescribeAuthenticationProfileResult.cpp b/generated/src/aws-cpp-sdk-connect/source/model/DescribeAuthenticationProfileResult.cpp
new file mode 100644
index 00000000000..786c21dc09a
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/source/model/DescribeAuthenticationProfileResult.cpp
@@ -0,0 +1,48 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/connect/model/DescribeAuthenticationProfileResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Connect::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+DescribeAuthenticationProfileResult::DescribeAuthenticationProfileResult()
+{
+}
+
+DescribeAuthenticationProfileResult::DescribeAuthenticationProfileResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+DescribeAuthenticationProfileResult& DescribeAuthenticationProfileResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("AuthenticationProfile"))
+  {
+    m_authenticationProfile = jsonValue.GetObject("AuthenticationProfile");
+
+  }
+
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-connect/source/model/ListAuthenticationProfilesRequest.cpp b/generated/src/aws-cpp-sdk-connect/source/model/ListAuthenticationProfilesRequest.cpp
new file mode 100644
index 00000000000..b7402eb49ce
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/source/model/ListAuthenticationProfilesRequest.cpp
@@ -0,0 +1,51 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/connect/model/ListAuthenticationProfilesRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/http/URI.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Connect::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws::Http;
+
+ListAuthenticationProfilesRequest::ListAuthenticationProfilesRequest() : 
+    m_instanceIdHasBeenSet(false),
+    m_maxResults(0),
+    m_maxResultsHasBeenSet(false),
+    m_nextTokenHasBeenSet(false)
+{
+}
+
+Aws::String ListAuthenticationProfilesRequest::SerializePayload() const
+{
+  return {};
+}
+
+void ListAuthenticationProfilesRequest::AddQueryStringParameters(URI& uri) const
+{
+    Aws::StringStream ss;
+    if(m_maxResultsHasBeenSet)
+    {
+      ss << m_maxResults;
+      uri.AddQueryStringParameter("maxResults", ss.str());
+      ss.str("");
+    }
+
+    if(m_nextTokenHasBeenSet)
+    {
+      ss << m_nextToken;
+      uri.AddQueryStringParameter("nextToken", ss.str());
+      ss.str("");
+    }
+
+}
+
+
+
diff --git a/generated/src/aws-cpp-sdk-connect/source/model/ListAuthenticationProfilesResult.cpp b/generated/src/aws-cpp-sdk-connect/source/model/ListAuthenticationProfilesResult.cpp
new file mode 100644
index 00000000000..9b9d36f8111
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/source/model/ListAuthenticationProfilesResult.cpp
@@ -0,0 +1,57 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/connect/model/ListAuthenticationProfilesResult.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+#include <aws/core/AmazonWebServiceResult.h>
+#include <aws/core/utils/StringUtils.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
+#include <utility>
+
+using namespace Aws::Connect::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+using namespace Aws;
+
+ListAuthenticationProfilesResult::ListAuthenticationProfilesResult()
+{
+}
+
+ListAuthenticationProfilesResult::ListAuthenticationProfilesResult(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  *this = result;
+}
+
+ListAuthenticationProfilesResult& ListAuthenticationProfilesResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
+{
+  JsonView jsonValue = result.GetPayload().View();
+  if(jsonValue.ValueExists("AuthenticationProfileSummaryList"))
+  {
+    Aws::Utils::Array<JsonView> authenticationProfileSummaryListJsonList = jsonValue.GetArray("AuthenticationProfileSummaryList");
+    for(unsigned authenticationProfileSummaryListIndex = 0; authenticationProfileSummaryListIndex < authenticationProfileSummaryListJsonList.GetLength(); ++authenticationProfileSummaryListIndex)
+    {
+      m_authenticationProfileSummaryList.push_back(authenticationProfileSummaryListJsonList[authenticationProfileSummaryListIndex].AsObject());
+    }
+  }
+
+  if(jsonValue.ValueExists("NextToken"))
+  {
+    m_nextToken = jsonValue.GetString("NextToken");
+
+  }
+
+
+  const auto& headers = result.GetHeaderValueCollection();
+  const auto& requestIdIter = headers.find("x-amzn-requestid");
+  if(requestIdIter != headers.end())
+  {
+    m_requestId = requestIdIter->second;
+  }
+
+
+  return *this;
+}
diff --git a/generated/src/aws-cpp-sdk-connect/source/model/UpdateAuthenticationProfileRequest.cpp b/generated/src/aws-cpp-sdk-connect/source/model/UpdateAuthenticationProfileRequest.cpp
new file mode 100644
index 00000000000..d50e1c5ff60
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-connect/source/model/UpdateAuthenticationProfileRequest.cpp
@@ -0,0 +1,76 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/connect/model/UpdateAuthenticationProfileRequest.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Connect::Model;
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+UpdateAuthenticationProfileRequest::UpdateAuthenticationProfileRequest() : 
+    m_authenticationProfileIdHasBeenSet(false),
+    m_instanceIdHasBeenSet(false),
+    m_nameHasBeenSet(false),
+    m_descriptionHasBeenSet(false),
+    m_allowedIpsHasBeenSet(false),
+    m_blockedIpsHasBeenSet(false),
+    m_periodicSessionDuration(0),
+    m_periodicSessionDurationHasBeenSet(false)
+{
+}
+
+Aws::String UpdateAuthenticationProfileRequest::SerializePayload() const
+{
+  JsonValue payload;
+
+  if(m_nameHasBeenSet)
+  {
+   payload.WithString("Name", m_name);
+
+  }
+
+  if(m_descriptionHasBeenSet)
+  {
+   payload.WithString("Description", m_description);
+
+  }
+
+  if(m_allowedIpsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> allowedIpsJsonList(m_allowedIps.size());
+   for(unsigned allowedIpsIndex = 0; allowedIpsIndex < allowedIpsJsonList.GetLength(); ++allowedIpsIndex)
+   {
+     allowedIpsJsonList[allowedIpsIndex].AsString(m_allowedIps[allowedIpsIndex]);
+   }
+   payload.WithArray("AllowedIps", std::move(allowedIpsJsonList));
+
+  }
+
+  if(m_blockedIpsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> blockedIpsJsonList(m_blockedIps.size());
+   for(unsigned blockedIpsIndex = 0; blockedIpsIndex < blockedIpsJsonList.GetLength(); ++blockedIpsIndex)
+   {
+     blockedIpsJsonList[blockedIpsIndex].AsString(m_blockedIps[blockedIpsIndex]);
+   }
+   payload.WithArray("BlockedIps", std::move(blockedIpsJsonList));
+
+  }
+
+  if(m_periodicSessionDurationHasBeenSet)
+  {
+   payload.WithInteger("PeriodicSessionDuration", m_periodicSessionDuration);
+
+  }
+
+  return payload.View().WriteReadable();
+}
+
+
+
+
diff --git a/generated/src/aws-cpp-sdk-eks/include/aws/eks/model/CapacityTypes.h b/generated/src/aws-cpp-sdk-eks/include/aws/eks/model/CapacityTypes.h
index e91a2082994..46258e8a0fc 100644
--- a/generated/src/aws-cpp-sdk-eks/include/aws/eks/model/CapacityTypes.h
+++ b/generated/src/aws-cpp-sdk-eks/include/aws/eks/model/CapacityTypes.h
@@ -17,7 +17,8 @@ namespace Model
   {
     NOT_SET,
     ON_DEMAND,
-    SPOT
+    SPOT,
+    CAPACITY_BLOCK
   };
 
 namespace CapacityTypesMapper
diff --git a/generated/src/aws-cpp-sdk-eks/source/model/CapacityTypes.cpp b/generated/src/aws-cpp-sdk-eks/source/model/CapacityTypes.cpp
index 564ff6e1e89..f568a52c64d 100644
--- a/generated/src/aws-cpp-sdk-eks/source/model/CapacityTypes.cpp
+++ b/generated/src/aws-cpp-sdk-eks/source/model/CapacityTypes.cpp
@@ -22,6 +22,7 @@ namespace Aws
 
         static const int ON_DEMAND_HASH = HashingUtils::HashString("ON_DEMAND");
         static const int SPOT_HASH = HashingUtils::HashString("SPOT");
+        static const int CAPACITY_BLOCK_HASH = HashingUtils::HashString("CAPACITY_BLOCK");
 
 
         CapacityTypes GetCapacityTypesForName(const Aws::String& name)
@@ -35,6 +36,10 @@ namespace Aws
           {
             return CapacityTypes::SPOT;
           }
+          else if (hashCode == CAPACITY_BLOCK_HASH)
+          {
+            return CapacityTypes::CAPACITY_BLOCK;
+          }
           EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
           if(overflowContainer)
           {
@@ -55,6 +60,8 @@ namespace Aws
             return "ON_DEMAND";
           case CapacityTypes::SPOT:
             return "SPOT";
+          case CapacityTypes::CAPACITY_BLOCK:
+            return "CAPACITY_BLOCK";
           default:
             EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
             if(overflowContainer)
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/PaymentCryptographyDataClient.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/PaymentCryptographyDataClient.h
index 0e339c97683..a5e33b56a4c 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/PaymentCryptographyDataClient.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/PaymentCryptographyDataClient.h
@@ -355,24 +355,19 @@ namespace PaymentCryptographyData
         }
 
         /**
-         * <p>Re-encrypt ciphertext using DUKPT, Symmetric and Asymmetric Data Encryption
-         * Keys. </p> <p>You can either generate an encryption key within Amazon Web
-         * Services Payment Cryptography by calling <a
+         * <p>Re-encrypt ciphertext using DUKPT or Symmetric data encryption keys. </p>
+         * <p>You can either generate an encryption key within Amazon Web Services Payment
+         * Cryptography by calling <a
          * href="https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_CreateKey.html">CreateKey</a>
          * or import your own encryption key by calling <a
          * href="https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ImportKey.html">ImportKey</a>.
          * The <code>KeyArn</code> for use with this operation must be in a compatible key
-         * state with <code>KeyModesOfUse</code> set to <code>Encrypt</code>. In asymmetric
-         * encryption, ciphertext is encrypted using public component (imported by calling
-         * <a
-         * href="https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ImportKey.html">ImportKey</a>)
-         * of the asymmetric key pair created outside of Amazon Web Services Payment
-         * Cryptography. </p> <p>For symmetric and DUKPT encryption, Amazon Web Services
-         * Payment Cryptography supports <code>TDES</code> and <code>AES</code> algorithms.
-         * For asymmetric encryption, Amazon Web Services Payment Cryptography supports
-         * <code>RSA</code>. To encrypt using DUKPT, a DUKPT key must already exist within
-         * your account with <code>KeyModesOfUse</code> set to <code>DeriveKey</code> or a
-         * new DUKPT can be generated by calling <a
+         * state with <code>KeyModesOfUse</code> set to <code>Encrypt</code>. </p> <p>For
+         * symmetric and DUKPT encryption, Amazon Web Services Payment Cryptography
+         * supports <code>TDES</code> and <code>AES</code> algorithms. To encrypt using
+         * DUKPT, a DUKPT key must already exist within your account with
+         * <code>KeyModesOfUse</code> set to <code>DeriveKey</code> or a new DUKPT can be
+         * generated by calling <a
          * href="https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_CreateKey.html">CreateKey</a>.</p>
          * <p>For information about valid keys for this operation, see <a
          * href="https://docs.aws.amazon.com/payment-cryptography/latest/userguide/keys-validattributes.html">Understanding
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardGenerationAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardGenerationAttributes.h
index 836c88a453c..c2b71568b9d 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardGenerationAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardGenerationAttributes.h
@@ -7,9 +7,9 @@
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/model/AmexCardSecurityCodeVersion1.h>
 #include <aws/payment-cryptography-data/model/AmexCardSecurityCodeVersion2.h>
-#include <aws/payment-cryptography-data/model/CardHolderVerificationValue.h>
 #include <aws/payment-cryptography-data/model/CardVerificationValue1.h>
 #include <aws/payment-cryptography-data/model/CardVerificationValue2.h>
+#include <aws/payment-cryptography-data/model/CardHolderVerificationValue.h>
 #include <aws/payment-cryptography-data/model/DynamicCardVerificationCode.h>
 #include <aws/payment-cryptography-data/model/DynamicCardVerificationValue.h>
 #include <utility>
@@ -68,19 +68,6 @@ namespace Model
     inline CardGenerationAttributes& WithAmexCardSecurityCodeVersion2(AmexCardSecurityCodeVersion2&& value) { SetAmexCardSecurityCodeVersion2(std::move(value)); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>Card data parameters that are required to generate a cardholder verification
-     * value for the payment card.</p>
-     */
-    inline const CardHolderVerificationValue& GetCardHolderVerificationValue() const{ return m_cardHolderVerificationValue; }
-    inline bool CardHolderVerificationValueHasBeenSet() const { return m_cardHolderVerificationValueHasBeenSet; }
-    inline void SetCardHolderVerificationValue(const CardHolderVerificationValue& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = value; }
-    inline void SetCardHolderVerificationValue(CardHolderVerificationValue&& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = std::move(value); }
-    inline CardGenerationAttributes& WithCardHolderVerificationValue(const CardHolderVerificationValue& value) { SetCardHolderVerificationValue(value); return *this;}
-    inline CardGenerationAttributes& WithCardHolderVerificationValue(CardHolderVerificationValue&& value) { SetCardHolderVerificationValue(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>Card data parameters that are required to generate Card Verification Value
@@ -107,6 +94,19 @@ namespace Model
     inline CardGenerationAttributes& WithCardVerificationValue2(CardVerificationValue2&& value) { SetCardVerificationValue2(std::move(value)); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>Card data parameters that are required to generate a cardholder verification
+     * value for the payment card.</p>
+     */
+    inline const CardHolderVerificationValue& GetCardHolderVerificationValue() const{ return m_cardHolderVerificationValue; }
+    inline bool CardHolderVerificationValueHasBeenSet() const { return m_cardHolderVerificationValueHasBeenSet; }
+    inline void SetCardHolderVerificationValue(const CardHolderVerificationValue& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = value; }
+    inline void SetCardHolderVerificationValue(CardHolderVerificationValue&& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = std::move(value); }
+    inline CardGenerationAttributes& WithCardHolderVerificationValue(const CardHolderVerificationValue& value) { SetCardHolderVerificationValue(value); return *this;}
+    inline CardGenerationAttributes& WithCardHolderVerificationValue(CardHolderVerificationValue&& value) { SetCardHolderVerificationValue(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>Card data parameters that are required to generate CDynamic Card Verification
@@ -140,15 +140,15 @@ namespace Model
     AmexCardSecurityCodeVersion2 m_amexCardSecurityCodeVersion2;
     bool m_amexCardSecurityCodeVersion2HasBeenSet = false;
 
-    CardHolderVerificationValue m_cardHolderVerificationValue;
-    bool m_cardHolderVerificationValueHasBeenSet = false;
-
     CardVerificationValue1 m_cardVerificationValue1;
     bool m_cardVerificationValue1HasBeenSet = false;
 
     CardVerificationValue2 m_cardVerificationValue2;
     bool m_cardVerificationValue2HasBeenSet = false;
 
+    CardHolderVerificationValue m_cardHolderVerificationValue;
+    bool m_cardHolderVerificationValueHasBeenSet = false;
+
     DynamicCardVerificationCode m_dynamicCardVerificationCode;
     bool m_dynamicCardVerificationCodeHasBeenSet = false;
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardHolderVerificationValue.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardHolderVerificationValue.h
index 4fc305cfcfb..97861a800e5 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardHolderVerificationValue.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardHolderVerificationValue.h
@@ -40,16 +40,16 @@ namespace Model
 
     ///@{
     /**
-     * <p>The transaction counter value that comes from a point of sale terminal.</p>
+     * <p>A random number generated by the issuer.</p>
      */
-    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
-    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
-    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
-    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
-    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
-    inline CardHolderVerificationValue& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
-    inline CardHolderVerificationValue& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
-    inline CardHolderVerificationValue& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    inline const Aws::String& GetUnpredictableNumber() const{ return m_unpredictableNumber; }
+    inline bool UnpredictableNumberHasBeenSet() const { return m_unpredictableNumberHasBeenSet; }
+    inline void SetUnpredictableNumber(const Aws::String& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = value; }
+    inline void SetUnpredictableNumber(Aws::String&& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = std::move(value); }
+    inline void SetUnpredictableNumber(const char* value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber.assign(value); }
+    inline CardHolderVerificationValue& WithUnpredictableNumber(const Aws::String& value) { SetUnpredictableNumber(value); return *this;}
+    inline CardHolderVerificationValue& WithUnpredictableNumber(Aws::String&& value) { SetUnpredictableNumber(std::move(value)); return *this;}
+    inline CardHolderVerificationValue& WithUnpredictableNumber(const char* value) { SetUnpredictableNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -69,27 +69,27 @@ namespace Model
 
     ///@{
     /**
-     * <p>A random number generated by the issuer.</p>
+     * <p>The transaction counter value that comes from a point of sale terminal.</p>
      */
-    inline const Aws::String& GetUnpredictableNumber() const{ return m_unpredictableNumber; }
-    inline bool UnpredictableNumberHasBeenSet() const { return m_unpredictableNumberHasBeenSet; }
-    inline void SetUnpredictableNumber(const Aws::String& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = value; }
-    inline void SetUnpredictableNumber(Aws::String&& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = std::move(value); }
-    inline void SetUnpredictableNumber(const char* value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber.assign(value); }
-    inline CardHolderVerificationValue& WithUnpredictableNumber(const Aws::String& value) { SetUnpredictableNumber(value); return *this;}
-    inline CardHolderVerificationValue& WithUnpredictableNumber(Aws::String&& value) { SetUnpredictableNumber(std::move(value)); return *this;}
-    inline CardHolderVerificationValue& WithUnpredictableNumber(const char* value) { SetUnpredictableNumber(value); return *this;}
+    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
+    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
+    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
+    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
+    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
+    inline CardHolderVerificationValue& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
+    inline CardHolderVerificationValue& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
+    inline CardHolderVerificationValue& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
     ///@}
   private:
 
-    Aws::String m_applicationTransactionCounter;
-    bool m_applicationTransactionCounterHasBeenSet = false;
+    Aws::String m_unpredictableNumber;
+    bool m_unpredictableNumberHasBeenSet = false;
 
     Aws::String m_panSequenceNumber;
     bool m_panSequenceNumberHasBeenSet = false;
 
-    Aws::String m_unpredictableNumber;
-    bool m_unpredictableNumberHasBeenSet = false;
+    Aws::String m_applicationTransactionCounter;
+    bool m_applicationTransactionCounterHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardVerificationAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardVerificationAttributes.h
index 8696d27470b..bda917514a9 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardVerificationAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/CardVerificationAttributes.h
@@ -7,12 +7,12 @@
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/model/AmexCardSecurityCodeVersion1.h>
 #include <aws/payment-cryptography-data/model/AmexCardSecurityCodeVersion2.h>
-#include <aws/payment-cryptography-data/model/CardHolderVerificationValue.h>
 #include <aws/payment-cryptography-data/model/CardVerificationValue1.h>
 #include <aws/payment-cryptography-data/model/CardVerificationValue2.h>
-#include <aws/payment-cryptography-data/model/DiscoverDynamicCardVerificationCode.h>
+#include <aws/payment-cryptography-data/model/CardHolderVerificationValue.h>
 #include <aws/payment-cryptography-data/model/DynamicCardVerificationCode.h>
 #include <aws/payment-cryptography-data/model/DynamicCardVerificationValue.h>
+#include <aws/payment-cryptography-data/model/DiscoverDynamicCardVerificationCode.h>
 #include <utility>
 
 namespace Aws
@@ -69,19 +69,6 @@ namespace Model
     inline CardVerificationAttributes& WithAmexCardSecurityCodeVersion2(AmexCardSecurityCodeVersion2&& value) { SetAmexCardSecurityCodeVersion2(std::move(value)); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>Card data parameters that are required to verify a cardholder verification
-     * value for the payment card.</p>
-     */
-    inline const CardHolderVerificationValue& GetCardHolderVerificationValue() const{ return m_cardHolderVerificationValue; }
-    inline bool CardHolderVerificationValueHasBeenSet() const { return m_cardHolderVerificationValueHasBeenSet; }
-    inline void SetCardHolderVerificationValue(const CardHolderVerificationValue& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = value; }
-    inline void SetCardHolderVerificationValue(CardHolderVerificationValue&& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = std::move(value); }
-    inline CardVerificationAttributes& WithCardHolderVerificationValue(const CardHolderVerificationValue& value) { SetCardHolderVerificationValue(value); return *this;}
-    inline CardVerificationAttributes& WithCardHolderVerificationValue(CardHolderVerificationValue&& value) { SetCardHolderVerificationValue(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>Card data parameters that are required to verify Card Verification Value
@@ -110,15 +97,15 @@ namespace Model
 
     ///@{
     /**
-     * <p>Card data parameters that are required to verify CDynamic Card Verification
-     * Code (dCVC) for the payment card.</p>
+     * <p>Card data parameters that are required to verify a cardholder verification
+     * value for the payment card.</p>
      */
-    inline const DiscoverDynamicCardVerificationCode& GetDiscoverDynamicCardVerificationCode() const{ return m_discoverDynamicCardVerificationCode; }
-    inline bool DiscoverDynamicCardVerificationCodeHasBeenSet() const { return m_discoverDynamicCardVerificationCodeHasBeenSet; }
-    inline void SetDiscoverDynamicCardVerificationCode(const DiscoverDynamicCardVerificationCode& value) { m_discoverDynamicCardVerificationCodeHasBeenSet = true; m_discoverDynamicCardVerificationCode = value; }
-    inline void SetDiscoverDynamicCardVerificationCode(DiscoverDynamicCardVerificationCode&& value) { m_discoverDynamicCardVerificationCodeHasBeenSet = true; m_discoverDynamicCardVerificationCode = std::move(value); }
-    inline CardVerificationAttributes& WithDiscoverDynamicCardVerificationCode(const DiscoverDynamicCardVerificationCode& value) { SetDiscoverDynamicCardVerificationCode(value); return *this;}
-    inline CardVerificationAttributes& WithDiscoverDynamicCardVerificationCode(DiscoverDynamicCardVerificationCode&& value) { SetDiscoverDynamicCardVerificationCode(std::move(value)); return *this;}
+    inline const CardHolderVerificationValue& GetCardHolderVerificationValue() const{ return m_cardHolderVerificationValue; }
+    inline bool CardHolderVerificationValueHasBeenSet() const { return m_cardHolderVerificationValueHasBeenSet; }
+    inline void SetCardHolderVerificationValue(const CardHolderVerificationValue& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = value; }
+    inline void SetCardHolderVerificationValue(CardHolderVerificationValue&& value) { m_cardHolderVerificationValueHasBeenSet = true; m_cardHolderVerificationValue = std::move(value); }
+    inline CardVerificationAttributes& WithCardHolderVerificationValue(const CardHolderVerificationValue& value) { SetCardHolderVerificationValue(value); return *this;}
+    inline CardVerificationAttributes& WithCardHolderVerificationValue(CardHolderVerificationValue&& value) { SetCardHolderVerificationValue(std::move(value)); return *this;}
     ///@}
 
     ///@{
@@ -146,6 +133,19 @@ namespace Model
     inline CardVerificationAttributes& WithDynamicCardVerificationValue(const DynamicCardVerificationValue& value) { SetDynamicCardVerificationValue(value); return *this;}
     inline CardVerificationAttributes& WithDynamicCardVerificationValue(DynamicCardVerificationValue&& value) { SetDynamicCardVerificationValue(std::move(value)); return *this;}
     ///@}
+
+    ///@{
+    /**
+     * <p>Card data parameters that are required to verify CDynamic Card Verification
+     * Code (dCVC) for the payment card.</p>
+     */
+    inline const DiscoverDynamicCardVerificationCode& GetDiscoverDynamicCardVerificationCode() const{ return m_discoverDynamicCardVerificationCode; }
+    inline bool DiscoverDynamicCardVerificationCodeHasBeenSet() const { return m_discoverDynamicCardVerificationCodeHasBeenSet; }
+    inline void SetDiscoverDynamicCardVerificationCode(const DiscoverDynamicCardVerificationCode& value) { m_discoverDynamicCardVerificationCodeHasBeenSet = true; m_discoverDynamicCardVerificationCode = value; }
+    inline void SetDiscoverDynamicCardVerificationCode(DiscoverDynamicCardVerificationCode&& value) { m_discoverDynamicCardVerificationCodeHasBeenSet = true; m_discoverDynamicCardVerificationCode = std::move(value); }
+    inline CardVerificationAttributes& WithDiscoverDynamicCardVerificationCode(const DiscoverDynamicCardVerificationCode& value) { SetDiscoverDynamicCardVerificationCode(value); return *this;}
+    inline CardVerificationAttributes& WithDiscoverDynamicCardVerificationCode(DiscoverDynamicCardVerificationCode&& value) { SetDiscoverDynamicCardVerificationCode(std::move(value)); return *this;}
+    ///@}
   private:
 
     AmexCardSecurityCodeVersion1 m_amexCardSecurityCodeVersion1;
@@ -154,23 +154,23 @@ namespace Model
     AmexCardSecurityCodeVersion2 m_amexCardSecurityCodeVersion2;
     bool m_amexCardSecurityCodeVersion2HasBeenSet = false;
 
-    CardHolderVerificationValue m_cardHolderVerificationValue;
-    bool m_cardHolderVerificationValueHasBeenSet = false;
-
     CardVerificationValue1 m_cardVerificationValue1;
     bool m_cardVerificationValue1HasBeenSet = false;
 
     CardVerificationValue2 m_cardVerificationValue2;
     bool m_cardVerificationValue2HasBeenSet = false;
 
-    DiscoverDynamicCardVerificationCode m_discoverDynamicCardVerificationCode;
-    bool m_discoverDynamicCardVerificationCodeHasBeenSet = false;
+    CardHolderVerificationValue m_cardHolderVerificationValue;
+    bool m_cardHolderVerificationValueHasBeenSet = false;
 
     DynamicCardVerificationCode m_dynamicCardVerificationCode;
     bool m_dynamicCardVerificationCodeHasBeenSet = false;
 
     DynamicCardVerificationValue m_dynamicCardVerificationValue;
     bool m_dynamicCardVerificationValueHasBeenSet = false;
+
+    DiscoverDynamicCardVerificationCode m_discoverDynamicCardVerificationCode;
+    bool m_discoverDynamicCardVerificationCodeHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DecryptDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DecryptDataRequest.h
index f3cd54debc8..a295e67d08f 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DecryptDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DecryptDataRequest.h
@@ -8,6 +8,7 @@
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/EncryptionDecryptionAttributes.h>
+#include <aws/payment-cryptography-data/model/WrappedKey.h>
 #include <utility>
 
 namespace Aws
@@ -33,6 +34,24 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the encryption key that Amazon Web Services
+     * Payment Cryptography uses for ciphertext decryption.</p> <p>When a
+     * WrappedKeyBlock is provided, this value will be the identifier to the key
+     * wrapping key. Otherwise, it is the key identifier used to perform the
+     * operation.</p>
+     */
+    inline const Aws::String& GetKeyIdentifier() const{ return m_keyIdentifier; }
+    inline bool KeyIdentifierHasBeenSet() const { return m_keyIdentifierHasBeenSet; }
+    inline void SetKeyIdentifier(const Aws::String& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = value; }
+    inline void SetKeyIdentifier(Aws::String&& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = std::move(value); }
+    inline void SetKeyIdentifier(const char* value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier.assign(value); }
+    inline DecryptDataRequest& WithKeyIdentifier(const Aws::String& value) { SetKeyIdentifier(value); return *this;}
+    inline DecryptDataRequest& WithKeyIdentifier(Aws::String&& value) { SetKeyIdentifier(std::move(value)); return *this;}
+    inline DecryptDataRequest& WithKeyIdentifier(const char* value) { SetKeyIdentifier(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The ciphertext to decrypt.</p>
@@ -61,28 +80,29 @@ namespace Model
 
     ///@{
     /**
-     * <p>The <code>keyARN</code> of the encryption key that Amazon Web Services
-     * Payment Cryptography uses for ciphertext decryption.</p>
+     * <p>The WrappedKeyBlock containing the encryption key for ciphertext
+     * decryption.</p>
      */
-    inline const Aws::String& GetKeyIdentifier() const{ return m_keyIdentifier; }
-    inline bool KeyIdentifierHasBeenSet() const { return m_keyIdentifierHasBeenSet; }
-    inline void SetKeyIdentifier(const Aws::String& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = value; }
-    inline void SetKeyIdentifier(Aws::String&& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = std::move(value); }
-    inline void SetKeyIdentifier(const char* value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier.assign(value); }
-    inline DecryptDataRequest& WithKeyIdentifier(const Aws::String& value) { SetKeyIdentifier(value); return *this;}
-    inline DecryptDataRequest& WithKeyIdentifier(Aws::String&& value) { SetKeyIdentifier(std::move(value)); return *this;}
-    inline DecryptDataRequest& WithKeyIdentifier(const char* value) { SetKeyIdentifier(value); return *this;}
+    inline const WrappedKey& GetWrappedKey() const{ return m_wrappedKey; }
+    inline bool WrappedKeyHasBeenSet() const { return m_wrappedKeyHasBeenSet; }
+    inline void SetWrappedKey(const WrappedKey& value) { m_wrappedKeyHasBeenSet = true; m_wrappedKey = value; }
+    inline void SetWrappedKey(WrappedKey&& value) { m_wrappedKeyHasBeenSet = true; m_wrappedKey = std::move(value); }
+    inline DecryptDataRequest& WithWrappedKey(const WrappedKey& value) { SetWrappedKey(value); return *this;}
+    inline DecryptDataRequest& WithWrappedKey(WrappedKey&& value) { SetWrappedKey(std::move(value)); return *this;}
     ///@}
   private:
 
+    Aws::String m_keyIdentifier;
+    bool m_keyIdentifierHasBeenSet = false;
+
     Aws::String m_cipherText;
     bool m_cipherTextHasBeenSet = false;
 
     EncryptionDecryptionAttributes m_decryptionAttributes;
     bool m_decryptionAttributesHasBeenSet = false;
 
-    Aws::String m_keyIdentifier;
-    bool m_keyIdentifierHasBeenSet = false;
+    WrappedKey m_wrappedKey;
+    bool m_wrappedKeyHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DiscoverDynamicCardVerificationCode.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DiscoverDynamicCardVerificationCode.h
index edcd005dce6..0e2122c42d3 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DiscoverDynamicCardVerificationCode.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DiscoverDynamicCardVerificationCode.h
@@ -38,20 +38,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>The transaction counter value that comes from the terminal.</p>
-     */
-    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
-    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
-    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
-    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
-    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
-    inline DiscoverDynamicCardVerificationCode& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
-    inline DiscoverDynamicCardVerificationCode& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
-    inline DiscoverDynamicCardVerificationCode& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The expiry date of a payment card.</p>
@@ -79,16 +65,30 @@ namespace Model
     inline DiscoverDynamicCardVerificationCode& WithUnpredictableNumber(Aws::String&& value) { SetUnpredictableNumber(std::move(value)); return *this;}
     inline DiscoverDynamicCardVerificationCode& WithUnpredictableNumber(const char* value) { SetUnpredictableNumber(value); return *this;}
     ///@}
-  private:
 
-    Aws::String m_applicationTransactionCounter;
-    bool m_applicationTransactionCounterHasBeenSet = false;
+    ///@{
+    /**
+     * <p>The transaction counter value that comes from the terminal.</p>
+     */
+    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
+    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
+    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
+    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
+    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
+    inline DiscoverDynamicCardVerificationCode& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
+    inline DiscoverDynamicCardVerificationCode& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
+    inline DiscoverDynamicCardVerificationCode& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    ///@}
+  private:
 
     Aws::String m_cardExpiryDate;
     bool m_cardExpiryDateHasBeenSet = false;
 
     Aws::String m_unpredictableNumber;
     bool m_unpredictableNumberHasBeenSet = false;
+
+    Aws::String m_applicationTransactionCounter;
+    bool m_applicationTransactionCounterHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptAttributes.h
index da0a009ddf9..e719fb571ac 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptAttributes.h
@@ -5,8 +5,8 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/payment-cryptography-data/model/DukptDerivationType.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/payment-cryptography-data/model/DukptDerivationType.h>
 #include <utility>
 
 namespace Aws
@@ -39,21 +39,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key
-     * Serial Number (KSN). This must be less than or equal to the strength of the BDK.
-     * For example, you can't use <code>AES_128</code> as a derivation type for a BDK
-     * of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>
-     */
-    inline const DukptDerivationType& GetDukptDerivationType() const{ return m_dukptDerivationType; }
-    inline bool DukptDerivationTypeHasBeenSet() const { return m_dukptDerivationTypeHasBeenSet; }
-    inline void SetDukptDerivationType(const DukptDerivationType& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = value; }
-    inline void SetDukptDerivationType(DukptDerivationType&& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = std::move(value); }
-    inline DukptAttributes& WithDukptDerivationType(const DukptDerivationType& value) { SetDukptDerivationType(value); return *this;}
-    inline DukptAttributes& WithDukptDerivationType(DukptDerivationType&& value) { SetDukptDerivationType(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The unique identifier known as Key Serial Number (KSN) that comes from an
@@ -69,13 +54,28 @@ namespace Model
     inline DukptAttributes& WithKeySerialNumber(Aws::String&& value) { SetKeySerialNumber(std::move(value)); return *this;}
     inline DukptAttributes& WithKeySerialNumber(const char* value) { SetKeySerialNumber(value); return *this;}
     ///@}
-  private:
 
-    DukptDerivationType m_dukptDerivationType;
-    bool m_dukptDerivationTypeHasBeenSet = false;
+    ///@{
+    /**
+     * <p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key
+     * Serial Number (KSN). This must be less than or equal to the strength of the BDK.
+     * For example, you can't use <code>AES_128</code> as a derivation type for a BDK
+     * of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>
+     */
+    inline const DukptDerivationType& GetDukptDerivationType() const{ return m_dukptDerivationType; }
+    inline bool DukptDerivationTypeHasBeenSet() const { return m_dukptDerivationTypeHasBeenSet; }
+    inline void SetDukptDerivationType(const DukptDerivationType& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = value; }
+    inline void SetDukptDerivationType(DukptDerivationType&& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = std::move(value); }
+    inline DukptAttributes& WithDukptDerivationType(const DukptDerivationType& value) { SetDukptDerivationType(value); return *this;}
+    inline DukptAttributes& WithDukptDerivationType(DukptDerivationType&& value) { SetDukptDerivationType(std::move(value)); return *this;}
+    ///@}
+  private:
 
     Aws::String m_keySerialNumber;
     bool m_keySerialNumberHasBeenSet = false;
+
+    DukptDerivationType m_dukptDerivationType;
+    bool m_dukptDerivationTypeHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptDerivationAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptDerivationAttributes.h
index 4f699ab6270..7976c57dfae 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptDerivationAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptDerivationAttributes.h
@@ -5,9 +5,9 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/DukptDerivationType.h>
 #include <aws/payment-cryptography-data/model/DukptKeyVariant.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 #include <utility>
 
 namespace Aws
@@ -40,6 +40,22 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
+    ///@{
+    /**
+     * <p>The unique identifier known as Key Serial Number (KSN) that comes from an
+     * encrypting device using DUKPT encryption method. The KSN is derived from the
+     * encrypting device unique identifier and an internal transaction counter.</p>
+     */
+    inline const Aws::String& GetKeySerialNumber() const{ return m_keySerialNumber; }
+    inline bool KeySerialNumberHasBeenSet() const { return m_keySerialNumberHasBeenSet; }
+    inline void SetKeySerialNumber(const Aws::String& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = value; }
+    inline void SetKeySerialNumber(Aws::String&& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = std::move(value); }
+    inline void SetKeySerialNumber(const char* value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber.assign(value); }
+    inline DukptDerivationAttributes& WithKeySerialNumber(const Aws::String& value) { SetKeySerialNumber(value); return *this;}
+    inline DukptDerivationAttributes& WithKeySerialNumber(Aws::String&& value) { SetKeySerialNumber(std::move(value)); return *this;}
+    inline DukptDerivationAttributes& WithKeySerialNumber(const char* value) { SetKeySerialNumber(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key
@@ -67,32 +83,16 @@ namespace Model
     inline DukptDerivationAttributes& WithDukptKeyVariant(const DukptKeyVariant& value) { SetDukptKeyVariant(value); return *this;}
     inline DukptDerivationAttributes& WithDukptKeyVariant(DukptKeyVariant&& value) { SetDukptKeyVariant(std::move(value)); return *this;}
     ///@}
-
-    ///@{
-    /**
-     * <p>The unique identifier known as Key Serial Number (KSN) that comes from an
-     * encrypting device using DUKPT encryption method. The KSN is derived from the
-     * encrypting device unique identifier and an internal transaction counter.</p>
-     */
-    inline const Aws::String& GetKeySerialNumber() const{ return m_keySerialNumber; }
-    inline bool KeySerialNumberHasBeenSet() const { return m_keySerialNumberHasBeenSet; }
-    inline void SetKeySerialNumber(const Aws::String& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = value; }
-    inline void SetKeySerialNumber(Aws::String&& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = std::move(value); }
-    inline void SetKeySerialNumber(const char* value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber.assign(value); }
-    inline DukptDerivationAttributes& WithKeySerialNumber(const Aws::String& value) { SetKeySerialNumber(value); return *this;}
-    inline DukptDerivationAttributes& WithKeySerialNumber(Aws::String&& value) { SetKeySerialNumber(std::move(value)); return *this;}
-    inline DukptDerivationAttributes& WithKeySerialNumber(const char* value) { SetKeySerialNumber(value); return *this;}
-    ///@}
   private:
 
+    Aws::String m_keySerialNumber;
+    bool m_keySerialNumberHasBeenSet = false;
+
     DukptDerivationType m_dukptKeyDerivationType;
     bool m_dukptKeyDerivationTypeHasBeenSet = false;
 
     DukptKeyVariant m_dukptKeyVariant;
     bool m_dukptKeyVariantHasBeenSet = false;
-
-    Aws::String m_keySerialNumber;
-    bool m_keySerialNumberHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptEncryptionAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptEncryptionAttributes.h
index 5856a377c04..b275e108eda 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptEncryptionAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DukptEncryptionAttributes.h
@@ -5,10 +5,10 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/payment-cryptography-data/model/DukptDerivationType.h>
-#include <aws/payment-cryptography-data/model/DukptKeyVariant.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/DukptEncryptionMode.h>
+#include <aws/payment-cryptography-data/model/DukptDerivationType.h>
+#include <aws/payment-cryptography-data/model/DukptKeyVariant.h>
 #include <utility>
 
 namespace Aws
@@ -41,6 +41,34 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
+    ///@{
+    /**
+     * <p>The unique identifier known as Key Serial Number (KSN) that comes from an
+     * encrypting device using DUKPT encryption method. The KSN is derived from the
+     * encrypting device unique identifier and an internal transaction counter.</p>
+     */
+    inline const Aws::String& GetKeySerialNumber() const{ return m_keySerialNumber; }
+    inline bool KeySerialNumberHasBeenSet() const { return m_keySerialNumberHasBeenSet; }
+    inline void SetKeySerialNumber(const Aws::String& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = value; }
+    inline void SetKeySerialNumber(Aws::String&& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = std::move(value); }
+    inline void SetKeySerialNumber(const char* value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber.assign(value); }
+    inline DukptEncryptionAttributes& WithKeySerialNumber(const Aws::String& value) { SetKeySerialNumber(value); return *this;}
+    inline DukptEncryptionAttributes& WithKeySerialNumber(Aws::String&& value) { SetKeySerialNumber(std::move(value)); return *this;}
+    inline DukptEncryptionAttributes& WithKeySerialNumber(const char* value) { SetKeySerialNumber(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The block cipher method to use for encryption.</p> <p>The default is CBC.</p>
+     */
+    inline const DukptEncryptionMode& GetMode() const{ return m_mode; }
+    inline bool ModeHasBeenSet() const { return m_modeHasBeenSet; }
+    inline void SetMode(const DukptEncryptionMode& value) { m_modeHasBeenSet = true; m_mode = value; }
+    inline void SetMode(DukptEncryptionMode&& value) { m_modeHasBeenSet = true; m_mode = std::move(value); }
+    inline DukptEncryptionAttributes& WithMode(const DukptEncryptionMode& value) { SetMode(value); return *this;}
+    inline DukptEncryptionAttributes& WithMode(DukptEncryptionMode&& value) { SetMode(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The key type encrypted using DUKPT from a Base Derivation Key (BDK) and Key
@@ -83,35 +111,13 @@ namespace Model
     inline DukptEncryptionAttributes& WithInitializationVector(Aws::String&& value) { SetInitializationVector(std::move(value)); return *this;}
     inline DukptEncryptionAttributes& WithInitializationVector(const char* value) { SetInitializationVector(value); return *this;}
     ///@}
+  private:
 
-    ///@{
-    /**
-     * <p>The unique identifier known as Key Serial Number (KSN) that comes from an
-     * encrypting device using DUKPT encryption method. The KSN is derived from the
-     * encrypting device unique identifier and an internal transaction counter.</p>
-     */
-    inline const Aws::String& GetKeySerialNumber() const{ return m_keySerialNumber; }
-    inline bool KeySerialNumberHasBeenSet() const { return m_keySerialNumberHasBeenSet; }
-    inline void SetKeySerialNumber(const Aws::String& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = value; }
-    inline void SetKeySerialNumber(Aws::String&& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = std::move(value); }
-    inline void SetKeySerialNumber(const char* value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber.assign(value); }
-    inline DukptEncryptionAttributes& WithKeySerialNumber(const Aws::String& value) { SetKeySerialNumber(value); return *this;}
-    inline DukptEncryptionAttributes& WithKeySerialNumber(Aws::String&& value) { SetKeySerialNumber(std::move(value)); return *this;}
-    inline DukptEncryptionAttributes& WithKeySerialNumber(const char* value) { SetKeySerialNumber(value); return *this;}
-    ///@}
+    Aws::String m_keySerialNumber;
+    bool m_keySerialNumberHasBeenSet = false;
 
-    ///@{
-    /**
-     * <p>The block cipher method to use for encryption.</p> <p>The default is CBC.</p>
-     */
-    inline const DukptEncryptionMode& GetMode() const{ return m_mode; }
-    inline bool ModeHasBeenSet() const { return m_modeHasBeenSet; }
-    inline void SetMode(const DukptEncryptionMode& value) { m_modeHasBeenSet = true; m_mode = value; }
-    inline void SetMode(DukptEncryptionMode&& value) { m_modeHasBeenSet = true; m_mode = std::move(value); }
-    inline DukptEncryptionAttributes& WithMode(const DukptEncryptionMode& value) { SetMode(value); return *this;}
-    inline DukptEncryptionAttributes& WithMode(DukptEncryptionMode&& value) { SetMode(std::move(value)); return *this;}
-    ///@}
-  private:
+    DukptEncryptionMode m_mode;
+    bool m_modeHasBeenSet = false;
 
     DukptDerivationType m_dukptKeyDerivationType;
     bool m_dukptKeyDerivationTypeHasBeenSet = false;
@@ -121,12 +127,6 @@ namespace Model
 
     Aws::String m_initializationVector;
     bool m_initializationVectorHasBeenSet = false;
-
-    Aws::String m_keySerialNumber;
-    bool m_keySerialNumberHasBeenSet = false;
-
-    DukptEncryptionMode m_mode;
-    bool m_modeHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationCode.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationCode.h
index af409ed0c32..59f75a23d94 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationCode.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationCode.h
@@ -40,16 +40,16 @@ namespace Model
 
     ///@{
     /**
-     * <p>The transaction counter value that comes from the terminal.</p>
+     * <p>A random number generated by the issuer.</p>
      */
-    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
-    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
-    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
-    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
-    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
-    inline DynamicCardVerificationCode& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
-    inline DynamicCardVerificationCode& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
-    inline DynamicCardVerificationCode& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    inline const Aws::String& GetUnpredictableNumber() const{ return m_unpredictableNumber; }
+    inline bool UnpredictableNumberHasBeenSet() const { return m_unpredictableNumberHasBeenSet; }
+    inline void SetUnpredictableNumber(const Aws::String& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = value; }
+    inline void SetUnpredictableNumber(Aws::String&& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = std::move(value); }
+    inline void SetUnpredictableNumber(const char* value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber.assign(value); }
+    inline DynamicCardVerificationCode& WithUnpredictableNumber(const Aws::String& value) { SetUnpredictableNumber(value); return *this;}
+    inline DynamicCardVerificationCode& WithUnpredictableNumber(Aws::String&& value) { SetUnpredictableNumber(std::move(value)); return *this;}
+    inline DynamicCardVerificationCode& WithUnpredictableNumber(const char* value) { SetUnpredictableNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -67,6 +67,20 @@ namespace Model
     inline DynamicCardVerificationCode& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The transaction counter value that comes from the terminal.</p>
+     */
+    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
+    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
+    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
+    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
+    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
+    inline DynamicCardVerificationCode& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
+    inline DynamicCardVerificationCode& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
+    inline DynamicCardVerificationCode& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The data on the two tracks of magnetic cards used for financial transactions.
@@ -82,33 +96,19 @@ namespace Model
     inline DynamicCardVerificationCode& WithTrackData(Aws::String&& value) { SetTrackData(std::move(value)); return *this;}
     inline DynamicCardVerificationCode& WithTrackData(const char* value) { SetTrackData(value); return *this;}
     ///@}
-
-    ///@{
-    /**
-     * <p>A random number generated by the issuer.</p>
-     */
-    inline const Aws::String& GetUnpredictableNumber() const{ return m_unpredictableNumber; }
-    inline bool UnpredictableNumberHasBeenSet() const { return m_unpredictableNumberHasBeenSet; }
-    inline void SetUnpredictableNumber(const Aws::String& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = value; }
-    inline void SetUnpredictableNumber(Aws::String&& value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber = std::move(value); }
-    inline void SetUnpredictableNumber(const char* value) { m_unpredictableNumberHasBeenSet = true; m_unpredictableNumber.assign(value); }
-    inline DynamicCardVerificationCode& WithUnpredictableNumber(const Aws::String& value) { SetUnpredictableNumber(value); return *this;}
-    inline DynamicCardVerificationCode& WithUnpredictableNumber(Aws::String&& value) { SetUnpredictableNumber(std::move(value)); return *this;}
-    inline DynamicCardVerificationCode& WithUnpredictableNumber(const char* value) { SetUnpredictableNumber(value); return *this;}
-    ///@}
   private:
 
-    Aws::String m_applicationTransactionCounter;
-    bool m_applicationTransactionCounterHasBeenSet = false;
+    Aws::String m_unpredictableNumber;
+    bool m_unpredictableNumberHasBeenSet = false;
 
     Aws::String m_panSequenceNumber;
     bool m_panSequenceNumberHasBeenSet = false;
 
+    Aws::String m_applicationTransactionCounter;
+    bool m_applicationTransactionCounterHasBeenSet = false;
+
     Aws::String m_trackData;
     bool m_trackDataHasBeenSet = false;
-
-    Aws::String m_unpredictableNumber;
-    bool m_unpredictableNumberHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationValue.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationValue.h
index 30ae3f9d371..06c1f85633b 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationValue.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/DynamicCardVerificationValue.h
@@ -40,16 +40,17 @@ namespace Model
 
     ///@{
     /**
-     * <p>The transaction counter value that comes from the terminal.</p>
+     * <p>A number that identifies and differentiates payment cards with the same
+     * Primary Account Number (PAN).</p>
      */
-    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
-    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
-    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
-    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
-    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
-    inline DynamicCardVerificationValue& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
-    inline DynamicCardVerificationValue& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
-    inline DynamicCardVerificationValue& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
+    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
+    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
+    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
+    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
+    inline DynamicCardVerificationValue& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
+    inline DynamicCardVerificationValue& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
+    inline DynamicCardVerificationValue& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -66,21 +67,6 @@ namespace Model
     inline DynamicCardVerificationValue& WithCardExpiryDate(const char* value) { SetCardExpiryDate(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>A number that identifies and differentiates payment cards with the same
-     * Primary Account Number (PAN).</p>
-     */
-    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
-    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
-    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
-    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
-    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
-    inline DynamicCardVerificationValue& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
-    inline DynamicCardVerificationValue& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
-    inline DynamicCardVerificationValue& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The service code of the payment card. This is different from Card Security
@@ -95,19 +81,33 @@ namespace Model
     inline DynamicCardVerificationValue& WithServiceCode(Aws::String&& value) { SetServiceCode(std::move(value)); return *this;}
     inline DynamicCardVerificationValue& WithServiceCode(const char* value) { SetServiceCode(value); return *this;}
     ///@}
+
+    ///@{
+    /**
+     * <p>The transaction counter value that comes from the terminal.</p>
+     */
+    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
+    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
+    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
+    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
+    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
+    inline DynamicCardVerificationValue& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
+    inline DynamicCardVerificationValue& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
+    inline DynamicCardVerificationValue& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    ///@}
   private:
 
-    Aws::String m_applicationTransactionCounter;
-    bool m_applicationTransactionCounterHasBeenSet = false;
+    Aws::String m_panSequenceNumber;
+    bool m_panSequenceNumberHasBeenSet = false;
 
     Aws::String m_cardExpiryDate;
     bool m_cardExpiryDateHasBeenSet = false;
 
-    Aws::String m_panSequenceNumber;
-    bool m_panSequenceNumberHasBeenSet = false;
-
     Aws::String m_serviceCode;
     bool m_serviceCodeHasBeenSet = false;
+
+    Aws::String m_applicationTransactionCounter;
+    bool m_applicationTransactionCounterHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EmvEncryptionAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EmvEncryptionAttributes.h
index 44573707055..e9bf7415e0c 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EmvEncryptionAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EmvEncryptionAttributes.h
@@ -5,8 +5,8 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/EmvMajorKeyDerivationMode.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/EmvEncryptionMode.h>
 #include <utility>
 
@@ -40,21 +40,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>An input used to provide the intial state. If no value is provided, Amazon
-     * Web Services Payment Cryptography defaults it to zero.</p>
-     */
-    inline const Aws::String& GetInitializationVector() const{ return m_initializationVector; }
-    inline bool InitializationVectorHasBeenSet() const { return m_initializationVectorHasBeenSet; }
-    inline void SetInitializationVector(const Aws::String& value) { m_initializationVectorHasBeenSet = true; m_initializationVector = value; }
-    inline void SetInitializationVector(Aws::String&& value) { m_initializationVectorHasBeenSet = true; m_initializationVector = std::move(value); }
-    inline void SetInitializationVector(const char* value) { m_initializationVectorHasBeenSet = true; m_initializationVector.assign(value); }
-    inline EmvEncryptionAttributes& WithInitializationVector(const Aws::String& value) { SetInitializationVector(value); return *this;}
-    inline EmvEncryptionAttributes& WithInitializationVector(Aws::String&& value) { SetInitializationVector(std::move(value)); return *this;}
-    inline EmvEncryptionAttributes& WithInitializationVector(const char* value) { SetInitializationVector(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The EMV derivation mode to use for ICC master key derivation as per EMV
@@ -70,14 +55,17 @@ namespace Model
 
     ///@{
     /**
-     * <p>The block cipher method to use for encryption.</p>
+     * <p>The Primary Account Number (PAN), a unique identifier for a payment credit or
+     * debit card and associates the card to a specific account holder.</p>
      */
-    inline const EmvEncryptionMode& GetMode() const{ return m_mode; }
-    inline bool ModeHasBeenSet() const { return m_modeHasBeenSet; }
-    inline void SetMode(const EmvEncryptionMode& value) { m_modeHasBeenSet = true; m_mode = value; }
-    inline void SetMode(EmvEncryptionMode&& value) { m_modeHasBeenSet = true; m_mode = std::move(value); }
-    inline EmvEncryptionAttributes& WithMode(const EmvEncryptionMode& value) { SetMode(value); return *this;}
-    inline EmvEncryptionAttributes& WithMode(EmvEncryptionMode&& value) { SetMode(std::move(value)); return *this;}
+    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
+    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
+    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
+    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
+    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
+    inline EmvEncryptionAttributes& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
+    inline EmvEncryptionAttributes& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
+    inline EmvEncryptionAttributes& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -95,21 +83,6 @@ namespace Model
     inline EmvEncryptionAttributes& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The Primary Account Number (PAN), a unique identifier for a payment credit or
-     * debit card and associates the card to a specific account holder.</p>
-     */
-    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
-    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
-    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
-    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
-    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
-    inline EmvEncryptionAttributes& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
-    inline EmvEncryptionAttributes& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
-    inline EmvEncryptionAttributes& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The derivation value used to derive the ICC session key. It is typically the
@@ -125,25 +98,52 @@ namespace Model
     inline EmvEncryptionAttributes& WithSessionDerivationData(Aws::String&& value) { SetSessionDerivationData(std::move(value)); return *this;}
     inline EmvEncryptionAttributes& WithSessionDerivationData(const char* value) { SetSessionDerivationData(value); return *this;}
     ///@}
-  private:
 
-    Aws::String m_initializationVector;
-    bool m_initializationVectorHasBeenSet = false;
+    ///@{
+    /**
+     * <p>The block cipher method to use for encryption.</p>
+     */
+    inline const EmvEncryptionMode& GetMode() const{ return m_mode; }
+    inline bool ModeHasBeenSet() const { return m_modeHasBeenSet; }
+    inline void SetMode(const EmvEncryptionMode& value) { m_modeHasBeenSet = true; m_mode = value; }
+    inline void SetMode(EmvEncryptionMode&& value) { m_modeHasBeenSet = true; m_mode = std::move(value); }
+    inline EmvEncryptionAttributes& WithMode(const EmvEncryptionMode& value) { SetMode(value); return *this;}
+    inline EmvEncryptionAttributes& WithMode(EmvEncryptionMode&& value) { SetMode(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>An input used to provide the intial state. If no value is provided, Amazon
+     * Web Services Payment Cryptography defaults it to zero.</p>
+     */
+    inline const Aws::String& GetInitializationVector() const{ return m_initializationVector; }
+    inline bool InitializationVectorHasBeenSet() const { return m_initializationVectorHasBeenSet; }
+    inline void SetInitializationVector(const Aws::String& value) { m_initializationVectorHasBeenSet = true; m_initializationVector = value; }
+    inline void SetInitializationVector(Aws::String&& value) { m_initializationVectorHasBeenSet = true; m_initializationVector = std::move(value); }
+    inline void SetInitializationVector(const char* value) { m_initializationVectorHasBeenSet = true; m_initializationVector.assign(value); }
+    inline EmvEncryptionAttributes& WithInitializationVector(const Aws::String& value) { SetInitializationVector(value); return *this;}
+    inline EmvEncryptionAttributes& WithInitializationVector(Aws::String&& value) { SetInitializationVector(std::move(value)); return *this;}
+    inline EmvEncryptionAttributes& WithInitializationVector(const char* value) { SetInitializationVector(value); return *this;}
+    ///@}
+  private:
 
     EmvMajorKeyDerivationMode m_majorKeyDerivationMode;
     bool m_majorKeyDerivationModeHasBeenSet = false;
 
-    EmvEncryptionMode m_mode;
-    bool m_modeHasBeenSet = false;
+    Aws::String m_primaryAccountNumber;
+    bool m_primaryAccountNumberHasBeenSet = false;
 
     Aws::String m_panSequenceNumber;
     bool m_panSequenceNumberHasBeenSet = false;
 
-    Aws::String m_primaryAccountNumber;
-    bool m_primaryAccountNumberHasBeenSet = false;
-
     Aws::String m_sessionDerivationData;
     bool m_sessionDerivationDataHasBeenSet = false;
+
+    EmvEncryptionMode m_mode;
+    bool m_modeHasBeenSet = false;
+
+    Aws::String m_initializationVector;
+    bool m_initializationVectorHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataRequest.h
index 916aabae96f..7f0dc1a7675 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataRequest.h
@@ -6,8 +6,9 @@
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
-#include <aws/payment-cryptography-data/model/EncryptionDecryptionAttributes.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/payment-cryptography-data/model/EncryptionDecryptionAttributes.h>
+#include <aws/payment-cryptography-data/model/WrappedKey.h>
 #include <utility>
 
 namespace Aws
@@ -33,22 +34,13 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
-    ///@{
-    /**
-     * <p>The encryption key type and attributes for plaintext encryption.</p>
-     */
-    inline const EncryptionDecryptionAttributes& GetEncryptionAttributes() const{ return m_encryptionAttributes; }
-    inline bool EncryptionAttributesHasBeenSet() const { return m_encryptionAttributesHasBeenSet; }
-    inline void SetEncryptionAttributes(const EncryptionDecryptionAttributes& value) { m_encryptionAttributesHasBeenSet = true; m_encryptionAttributes = value; }
-    inline void SetEncryptionAttributes(EncryptionDecryptionAttributes&& value) { m_encryptionAttributesHasBeenSet = true; m_encryptionAttributes = std::move(value); }
-    inline EncryptDataRequest& WithEncryptionAttributes(const EncryptionDecryptionAttributes& value) { SetEncryptionAttributes(value); return *this;}
-    inline EncryptDataRequest& WithEncryptionAttributes(EncryptionDecryptionAttributes&& value) { SetEncryptionAttributes(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The <code>keyARN</code> of the encryption key that Amazon Web Services
-     * Payment Cryptography uses for plaintext encryption.</p>
+     * Payment Cryptography uses for plaintext encryption.</p> <p>When a
+     * WrappedKeyBlock is provided, this value will be the identifier to the key
+     * wrapping key. Otherwise, it is the key identifier used to perform the
+     * operation.</p>
      */
     inline const Aws::String& GetKeyIdentifier() const{ return m_keyIdentifier; }
     inline bool KeyIdentifierHasBeenSet() const { return m_keyIdentifierHasBeenSet; }
@@ -79,16 +71,44 @@ namespace Model
     inline EncryptDataRequest& WithPlainText(Aws::String&& value) { SetPlainText(std::move(value)); return *this;}
     inline EncryptDataRequest& WithPlainText(const char* value) { SetPlainText(value); return *this;}
     ///@}
-  private:
 
-    EncryptionDecryptionAttributes m_encryptionAttributes;
-    bool m_encryptionAttributesHasBeenSet = false;
+    ///@{
+    /**
+     * <p>The encryption key type and attributes for plaintext encryption.</p>
+     */
+    inline const EncryptionDecryptionAttributes& GetEncryptionAttributes() const{ return m_encryptionAttributes; }
+    inline bool EncryptionAttributesHasBeenSet() const { return m_encryptionAttributesHasBeenSet; }
+    inline void SetEncryptionAttributes(const EncryptionDecryptionAttributes& value) { m_encryptionAttributesHasBeenSet = true; m_encryptionAttributes = value; }
+    inline void SetEncryptionAttributes(EncryptionDecryptionAttributes&& value) { m_encryptionAttributesHasBeenSet = true; m_encryptionAttributes = std::move(value); }
+    inline EncryptDataRequest& WithEncryptionAttributes(const EncryptionDecryptionAttributes& value) { SetEncryptionAttributes(value); return *this;}
+    inline EncryptDataRequest& WithEncryptionAttributes(EncryptionDecryptionAttributes&& value) { SetEncryptionAttributes(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The WrappedKeyBlock containing the encryption key for plaintext
+     * encryption.</p>
+     */
+    inline const WrappedKey& GetWrappedKey() const{ return m_wrappedKey; }
+    inline bool WrappedKeyHasBeenSet() const { return m_wrappedKeyHasBeenSet; }
+    inline void SetWrappedKey(const WrappedKey& value) { m_wrappedKeyHasBeenSet = true; m_wrappedKey = value; }
+    inline void SetWrappedKey(WrappedKey&& value) { m_wrappedKeyHasBeenSet = true; m_wrappedKey = std::move(value); }
+    inline EncryptDataRequest& WithWrappedKey(const WrappedKey& value) { SetWrappedKey(value); return *this;}
+    inline EncryptDataRequest& WithWrappedKey(WrappedKey&& value) { SetWrappedKey(std::move(value)); return *this;}
+    ///@}
+  private:
 
     Aws::String m_keyIdentifier;
     bool m_keyIdentifierHasBeenSet = false;
 
     Aws::String m_plainText;
     bool m_plainTextHasBeenSet = false;
+
+    EncryptionDecryptionAttributes m_encryptionAttributes;
+    bool m_encryptionAttributesHasBeenSet = false;
+
+    WrappedKey m_wrappedKey;
+    bool m_wrappedKeyHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataResult.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataResult.h
index 6193e449d0e..42d1a1492d3 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataResult.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptDataResult.h
@@ -32,19 +32,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API EncryptDataResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
 
 
-    ///@{
-    /**
-     * <p>The encrypted ciphertext.</p>
-     */
-    inline const Aws::String& GetCipherText() const{ return m_cipherText; }
-    inline void SetCipherText(const Aws::String& value) { m_cipherText = value; }
-    inline void SetCipherText(Aws::String&& value) { m_cipherText = std::move(value); }
-    inline void SetCipherText(const char* value) { m_cipherText.assign(value); }
-    inline EncryptDataResult& WithCipherText(const Aws::String& value) { SetCipherText(value); return *this;}
-    inline EncryptDataResult& WithCipherText(Aws::String&& value) { SetCipherText(std::move(value)); return *this;}
-    inline EncryptDataResult& WithCipherText(const char* value) { SetCipherText(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The <code>keyARN</code> of the encryption key that Amazon Web Services
@@ -75,6 +62,19 @@ namespace Model
     inline EncryptDataResult& WithKeyCheckValue(const char* value) { SetKeyCheckValue(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The encrypted ciphertext.</p>
+     */
+    inline const Aws::String& GetCipherText() const{ return m_cipherText; }
+    inline void SetCipherText(const Aws::String& value) { m_cipherText = value; }
+    inline void SetCipherText(Aws::String&& value) { m_cipherText = std::move(value); }
+    inline void SetCipherText(const char* value) { m_cipherText.assign(value); }
+    inline EncryptDataResult& WithCipherText(const Aws::String& value) { SetCipherText(value); return *this;}
+    inline EncryptDataResult& WithCipherText(Aws::String&& value) { SetCipherText(std::move(value)); return *this;}
+    inline EncryptDataResult& WithCipherText(const char* value) { SetCipherText(value); return *this;}
+    ///@}
+
     ///@{
     
     inline const Aws::String& GetRequestId() const{ return m_requestId; }
@@ -87,12 +87,12 @@ namespace Model
     ///@}
   private:
 
-    Aws::String m_cipherText;
-
     Aws::String m_keyArn;
 
     Aws::String m_keyCheckValue;
 
+    Aws::String m_cipherText;
+
     Aws::String m_requestId;
   };
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptionDecryptionAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptionDecryptionAttributes.h
index 08d1c212f54..2e93c0ec8aa 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptionDecryptionAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/EncryptionDecryptionAttributes.h
@@ -5,10 +5,10 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
+#include <aws/payment-cryptography-data/model/SymmetricEncryptionAttributes.h>
 #include <aws/payment-cryptography-data/model/AsymmetricEncryptionAttributes.h>
 #include <aws/payment-cryptography-data/model/DukptEncryptionAttributes.h>
 #include <aws/payment-cryptography-data/model/EmvEncryptionAttributes.h>
-#include <aws/payment-cryptography-data/model/SymmetricEncryptionAttributes.h>
 #include <utility>
 
 namespace Aws
@@ -41,6 +41,19 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
+    ///@{
+    /**
+     * <p>Parameters that are required to perform encryption and decryption using
+     * symmetric keys.</p>
+     */
+    inline const SymmetricEncryptionAttributes& GetSymmetric() const{ return m_symmetric; }
+    inline bool SymmetricHasBeenSet() const { return m_symmetricHasBeenSet; }
+    inline void SetSymmetric(const SymmetricEncryptionAttributes& value) { m_symmetricHasBeenSet = true; m_symmetric = value; }
+    inline void SetSymmetric(SymmetricEncryptionAttributes&& value) { m_symmetricHasBeenSet = true; m_symmetric = std::move(value); }
+    inline EncryptionDecryptionAttributes& WithSymmetric(const SymmetricEncryptionAttributes& value) { SetSymmetric(value); return *this;}
+    inline EncryptionDecryptionAttributes& WithSymmetric(SymmetricEncryptionAttributes&& value) { SetSymmetric(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     
     inline const AsymmetricEncryptionAttributes& GetAsymmetric() const{ return m_asymmetric; }
@@ -72,21 +85,11 @@ namespace Model
     inline EncryptionDecryptionAttributes& WithEmv(const EmvEncryptionAttributes& value) { SetEmv(value); return *this;}
     inline EncryptionDecryptionAttributes& WithEmv(EmvEncryptionAttributes&& value) { SetEmv(std::move(value)); return *this;}
     ///@}
-
-    ///@{
-    /**
-     * <p>Parameters that are required to perform encryption and decryption using
-     * symmetric keys.</p>
-     */
-    inline const SymmetricEncryptionAttributes& GetSymmetric() const{ return m_symmetric; }
-    inline bool SymmetricHasBeenSet() const { return m_symmetricHasBeenSet; }
-    inline void SetSymmetric(const SymmetricEncryptionAttributes& value) { m_symmetricHasBeenSet = true; m_symmetric = value; }
-    inline void SetSymmetric(SymmetricEncryptionAttributes&& value) { m_symmetricHasBeenSet = true; m_symmetric = std::move(value); }
-    inline EncryptionDecryptionAttributes& WithSymmetric(const SymmetricEncryptionAttributes& value) { SetSymmetric(value); return *this;}
-    inline EncryptionDecryptionAttributes& WithSymmetric(SymmetricEncryptionAttributes&& value) { SetSymmetric(std::move(value)); return *this;}
-    ///@}
   private:
 
+    SymmetricEncryptionAttributes m_symmetric;
+    bool m_symmetricHasBeenSet = false;
+
     AsymmetricEncryptionAttributes m_asymmetric;
     bool m_asymmetricHasBeenSet = false;
 
@@ -95,9 +98,6 @@ namespace Model
 
     EmvEncryptionAttributes m_emv;
     bool m_emvHasBeenSet = false;
-
-    SymmetricEncryptionAttributes m_symmetric;
-    bool m_symmetricHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateCardValidationDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateCardValidationDataRequest.h
index 19b8107eaf3..5e727716a63 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateCardValidationDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateCardValidationDataRequest.h
@@ -6,8 +6,8 @@
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
-#include <aws/payment-cryptography-data/model/CardGenerationAttributes.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/payment-cryptography-data/model/CardGenerationAttributes.h>
 #include <utility>
 
 namespace Aws
@@ -33,19 +33,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
-    ///@{
-    /**
-     * <p>The algorithm for generating CVV or CSC values for the card within Amazon Web
-     * Services Payment Cryptography.</p>
-     */
-    inline const CardGenerationAttributes& GetGenerationAttributes() const{ return m_generationAttributes; }
-    inline bool GenerationAttributesHasBeenSet() const { return m_generationAttributesHasBeenSet; }
-    inline void SetGenerationAttributes(const CardGenerationAttributes& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = value; }
-    inline void SetGenerationAttributes(CardGenerationAttributes&& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = std::move(value); }
-    inline GenerateCardValidationDataRequest& WithGenerationAttributes(const CardGenerationAttributes& value) { SetGenerationAttributes(value); return *this;}
-    inline GenerateCardValidationDataRequest& WithGenerationAttributes(CardGenerationAttributes&& value) { SetGenerationAttributes(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The <code>keyARN</code> of the CVK encryption key that Amazon Web Services
@@ -76,6 +63,19 @@ namespace Model
     inline GenerateCardValidationDataRequest& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The algorithm for generating CVV or CSC values for the card within Amazon Web
+     * Services Payment Cryptography.</p>
+     */
+    inline const CardGenerationAttributes& GetGenerationAttributes() const{ return m_generationAttributes; }
+    inline bool GenerationAttributesHasBeenSet() const { return m_generationAttributesHasBeenSet; }
+    inline void SetGenerationAttributes(const CardGenerationAttributes& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = value; }
+    inline void SetGenerationAttributes(CardGenerationAttributes&& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = std::move(value); }
+    inline GenerateCardValidationDataRequest& WithGenerationAttributes(const CardGenerationAttributes& value) { SetGenerationAttributes(value); return *this;}
+    inline GenerateCardValidationDataRequest& WithGenerationAttributes(CardGenerationAttributes&& value) { SetGenerationAttributes(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The length of the CVV or CSC to be generated. The default value is 3.</p>
@@ -87,15 +87,15 @@ namespace Model
     ///@}
   private:
 
-    CardGenerationAttributes m_generationAttributes;
-    bool m_generationAttributesHasBeenSet = false;
-
     Aws::String m_keyIdentifier;
     bool m_keyIdentifierHasBeenSet = false;
 
     Aws::String m_primaryAccountNumber;
     bool m_primaryAccountNumberHasBeenSet = false;
 
+    CardGenerationAttributes m_generationAttributes;
+    bool m_generationAttributesHasBeenSet = false;
+
     int m_validationDataLength;
     bool m_validationDataLengthHasBeenSet = false;
   };
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateMacRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateMacRequest.h
index 629766a8567..f3b8d890ead 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateMacRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GenerateMacRequest.h
@@ -6,8 +6,8 @@
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
-#include <aws/payment-cryptography-data/model/MacAttributes.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/payment-cryptography-data/model/MacAttributes.h>
 #include <utility>
 
 namespace Aws
@@ -33,19 +33,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
-    ///@{
-    /**
-     * <p>The attributes and data values to use for MAC generation within Amazon Web
-     * Services Payment Cryptography.</p>
-     */
-    inline const MacAttributes& GetGenerationAttributes() const{ return m_generationAttributes; }
-    inline bool GenerationAttributesHasBeenSet() const { return m_generationAttributesHasBeenSet; }
-    inline void SetGenerationAttributes(const MacAttributes& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = value; }
-    inline void SetGenerationAttributes(MacAttributes&& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = std::move(value); }
-    inline GenerateMacRequest& WithGenerationAttributes(const MacAttributes& value) { SetGenerationAttributes(value); return *this;}
-    inline GenerateMacRequest& WithGenerationAttributes(MacAttributes&& value) { SetGenerationAttributes(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The <code>keyARN</code> of the MAC generation encryption key.</p>
@@ -60,16 +47,6 @@ namespace Model
     inline GenerateMacRequest& WithKeyIdentifier(const char* value) { SetKeyIdentifier(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The length of a MAC under generation.</p>
-     */
-    inline int GetMacLength() const{ return m_macLength; }
-    inline bool MacLengthHasBeenSet() const { return m_macLengthHasBeenSet; }
-    inline void SetMacLength(int value) { m_macLengthHasBeenSet = true; m_macLength = value; }
-    inline GenerateMacRequest& WithMacLength(int value) { SetMacLength(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The data for which a MAC is under generation. This value must be
@@ -84,19 +61,42 @@ namespace Model
     inline GenerateMacRequest& WithMessageData(Aws::String&& value) { SetMessageData(std::move(value)); return *this;}
     inline GenerateMacRequest& WithMessageData(const char* value) { SetMessageData(value); return *this;}
     ///@}
-  private:
 
-    MacAttributes m_generationAttributes;
-    bool m_generationAttributesHasBeenSet = false;
+    ///@{
+    /**
+     * <p>The attributes and data values to use for MAC generation within Amazon Web
+     * Services Payment Cryptography.</p>
+     */
+    inline const MacAttributes& GetGenerationAttributes() const{ return m_generationAttributes; }
+    inline bool GenerationAttributesHasBeenSet() const { return m_generationAttributesHasBeenSet; }
+    inline void SetGenerationAttributes(const MacAttributes& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = value; }
+    inline void SetGenerationAttributes(MacAttributes&& value) { m_generationAttributesHasBeenSet = true; m_generationAttributes = std::move(value); }
+    inline GenerateMacRequest& WithGenerationAttributes(const MacAttributes& value) { SetGenerationAttributes(value); return *this;}
+    inline GenerateMacRequest& WithGenerationAttributes(MacAttributes&& value) { SetGenerationAttributes(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The length of a MAC under generation.</p>
+     */
+    inline int GetMacLength() const{ return m_macLength; }
+    inline bool MacLengthHasBeenSet() const { return m_macLengthHasBeenSet; }
+    inline void SetMacLength(int value) { m_macLengthHasBeenSet = true; m_macLength = value; }
+    inline GenerateMacRequest& WithMacLength(int value) { SetMacLength(value); return *this;}
+    ///@}
+  private:
 
     Aws::String m_keyIdentifier;
     bool m_keyIdentifierHasBeenSet = false;
 
-    int m_macLength;
-    bool m_macLengthHasBeenSet = false;
-
     Aws::String m_messageData;
     bool m_messageDataHasBeenSet = false;
+
+    MacAttributes m_generationAttributes;
+    bool m_generationAttributesHasBeenSet = false;
+
+    int m_macLength;
+    bool m_macLengthHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataRequest.h
index eb3c1c675b9..20b5871fdae 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataRequest.h
@@ -34,6 +34,21 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment
+     * Cryptography uses for pin data generation.</p>
+     */
+    inline const Aws::String& GetGenerationKeyIdentifier() const{ return m_generationKeyIdentifier; }
+    inline bool GenerationKeyIdentifierHasBeenSet() const { return m_generationKeyIdentifierHasBeenSet; }
+    inline void SetGenerationKeyIdentifier(const Aws::String& value) { m_generationKeyIdentifierHasBeenSet = true; m_generationKeyIdentifier = value; }
+    inline void SetGenerationKeyIdentifier(Aws::String&& value) { m_generationKeyIdentifierHasBeenSet = true; m_generationKeyIdentifier = std::move(value); }
+    inline void SetGenerationKeyIdentifier(const char* value) { m_generationKeyIdentifierHasBeenSet = true; m_generationKeyIdentifier.assign(value); }
+    inline GeneratePinDataRequest& WithGenerationKeyIdentifier(const Aws::String& value) { SetGenerationKeyIdentifier(value); return *this;}
+    inline GeneratePinDataRequest& WithGenerationKeyIdentifier(Aws::String&& value) { SetGenerationKeyIdentifier(std::move(value)); return *this;}
+    inline GeneratePinDataRequest& WithGenerationKeyIdentifier(const char* value) { SetGenerationKeyIdentifier(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment
@@ -61,40 +76,6 @@ namespace Model
     inline GeneratePinDataRequest& WithGenerationAttributes(PinGenerationAttributes&& value) { SetGenerationAttributes(std::move(value)); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment
-     * Cryptography uses for pin data generation.</p>
-     */
-    inline const Aws::String& GetGenerationKeyIdentifier() const{ return m_generationKeyIdentifier; }
-    inline bool GenerationKeyIdentifierHasBeenSet() const { return m_generationKeyIdentifierHasBeenSet; }
-    inline void SetGenerationKeyIdentifier(const Aws::String& value) { m_generationKeyIdentifierHasBeenSet = true; m_generationKeyIdentifier = value; }
-    inline void SetGenerationKeyIdentifier(Aws::String&& value) { m_generationKeyIdentifierHasBeenSet = true; m_generationKeyIdentifier = std::move(value); }
-    inline void SetGenerationKeyIdentifier(const char* value) { m_generationKeyIdentifierHasBeenSet = true; m_generationKeyIdentifier.assign(value); }
-    inline GeneratePinDataRequest& WithGenerationKeyIdentifier(const Aws::String& value) { SetGenerationKeyIdentifier(value); return *this;}
-    inline GeneratePinDataRequest& WithGenerationKeyIdentifier(Aws::String&& value) { SetGenerationKeyIdentifier(std::move(value)); return *this;}
-    inline GeneratePinDataRequest& WithGenerationKeyIdentifier(const char* value) { SetGenerationKeyIdentifier(value); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>The PIN encoding format for pin data generation as specified in ISO 9564.
-     * Amazon Web Services Payment Cryptography supports <code>ISO_Format_0</code> and
-     * <code>ISO_Format_3</code>.</p> <p>The <code>ISO_Format_0</code> PIN block format
-     * is equivalent to the ANSI X9.8, VISA-1, and ECI-1 PIN block formats. It is
-     * similar to a VISA-4 PIN block format. It supports a PIN from 4 to 12 digits in
-     * length.</p> <p>The <code>ISO_Format_3</code> PIN block format is the same as
-     * <code>ISO_Format_0</code> except that the fill digits are random values from 10
-     * to 15.</p>
-     */
-    inline const PinBlockFormatForPinData& GetPinBlockFormat() const{ return m_pinBlockFormat; }
-    inline bool PinBlockFormatHasBeenSet() const { return m_pinBlockFormatHasBeenSet; }
-    inline void SetPinBlockFormat(const PinBlockFormatForPinData& value) { m_pinBlockFormatHasBeenSet = true; m_pinBlockFormat = value; }
-    inline void SetPinBlockFormat(PinBlockFormatForPinData&& value) { m_pinBlockFormatHasBeenSet = true; m_pinBlockFormat = std::move(value); }
-    inline GeneratePinDataRequest& WithPinBlockFormat(const PinBlockFormatForPinData& value) { SetPinBlockFormat(value); return *this;}
-    inline GeneratePinDataRequest& WithPinBlockFormat(PinBlockFormatForPinData&& value) { SetPinBlockFormat(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The length of PIN under generation.</p>
@@ -119,25 +100,44 @@ namespace Model
     inline GeneratePinDataRequest& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
     inline GeneratePinDataRequest& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
+
+    ///@{
+    /**
+     * <p>The PIN encoding format for pin data generation as specified in ISO 9564.
+     * Amazon Web Services Payment Cryptography supports <code>ISO_Format_0</code> and
+     * <code>ISO_Format_3</code>.</p> <p>The <code>ISO_Format_0</code> PIN block format
+     * is equivalent to the ANSI X9.8, VISA-1, and ECI-1 PIN block formats. It is
+     * similar to a VISA-4 PIN block format. It supports a PIN from 4 to 12 digits in
+     * length.</p> <p>The <code>ISO_Format_3</code> PIN block format is the same as
+     * <code>ISO_Format_0</code> except that the fill digits are random values from 10
+     * to 15.</p>
+     */
+    inline const PinBlockFormatForPinData& GetPinBlockFormat() const{ return m_pinBlockFormat; }
+    inline bool PinBlockFormatHasBeenSet() const { return m_pinBlockFormatHasBeenSet; }
+    inline void SetPinBlockFormat(const PinBlockFormatForPinData& value) { m_pinBlockFormatHasBeenSet = true; m_pinBlockFormat = value; }
+    inline void SetPinBlockFormat(PinBlockFormatForPinData&& value) { m_pinBlockFormatHasBeenSet = true; m_pinBlockFormat = std::move(value); }
+    inline GeneratePinDataRequest& WithPinBlockFormat(const PinBlockFormatForPinData& value) { SetPinBlockFormat(value); return *this;}
+    inline GeneratePinDataRequest& WithPinBlockFormat(PinBlockFormatForPinData&& value) { SetPinBlockFormat(std::move(value)); return *this;}
+    ///@}
   private:
 
+    Aws::String m_generationKeyIdentifier;
+    bool m_generationKeyIdentifierHasBeenSet = false;
+
     Aws::String m_encryptionKeyIdentifier;
     bool m_encryptionKeyIdentifierHasBeenSet = false;
 
     PinGenerationAttributes m_generationAttributes;
     bool m_generationAttributesHasBeenSet = false;
 
-    Aws::String m_generationKeyIdentifier;
-    bool m_generationKeyIdentifierHasBeenSet = false;
-
-    PinBlockFormatForPinData m_pinBlockFormat;
-    bool m_pinBlockFormatHasBeenSet = false;
-
     int m_pinDataLength;
     bool m_pinDataLengthHasBeenSet = false;
 
     Aws::String m_primaryAccountNumber;
     bool m_primaryAccountNumberHasBeenSet = false;
+
+    PinBlockFormatForPinData m_pinBlockFormat;
+    bool m_pinBlockFormatHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataResult.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataResult.h
index 675c195dfca..baa95b99830 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataResult.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/GeneratePinDataResult.h
@@ -35,18 +35,32 @@ namespace Model
 
     ///@{
     /**
-     * <p>The PIN block encrypted under PEK from Amazon Web Services Payment
-     * Cryptography. The encrypted PIN block is a composite of PAN (Primary Account
-     * Number) and PIN (Personal Identification Number), generated in accordance with
-     * ISO 9564 standard.</p>
+     * <p>The <code>keyARN</code> of the pin data generation key that Amazon Web
+     * Services Payment Cryptography uses for PIN, PVV or PIN Offset generation.</p>
      */
-    inline const Aws::String& GetEncryptedPinBlock() const{ return m_encryptedPinBlock; }
-    inline void SetEncryptedPinBlock(const Aws::String& value) { m_encryptedPinBlock = value; }
-    inline void SetEncryptedPinBlock(Aws::String&& value) { m_encryptedPinBlock = std::move(value); }
-    inline void SetEncryptedPinBlock(const char* value) { m_encryptedPinBlock.assign(value); }
-    inline GeneratePinDataResult& WithEncryptedPinBlock(const Aws::String& value) { SetEncryptedPinBlock(value); return *this;}
-    inline GeneratePinDataResult& WithEncryptedPinBlock(Aws::String&& value) { SetEncryptedPinBlock(std::move(value)); return *this;}
-    inline GeneratePinDataResult& WithEncryptedPinBlock(const char* value) { SetEncryptedPinBlock(value); return *this;}
+    inline const Aws::String& GetGenerationKeyArn() const{ return m_generationKeyArn; }
+    inline void SetGenerationKeyArn(const Aws::String& value) { m_generationKeyArn = value; }
+    inline void SetGenerationKeyArn(Aws::String&& value) { m_generationKeyArn = std::move(value); }
+    inline void SetGenerationKeyArn(const char* value) { m_generationKeyArn.assign(value); }
+    inline GeneratePinDataResult& WithGenerationKeyArn(const Aws::String& value) { SetGenerationKeyArn(value); return *this;}
+    inline GeneratePinDataResult& WithGenerationKeyArn(Aws::String&& value) { SetGenerationKeyArn(std::move(value)); return *this;}
+    inline GeneratePinDataResult& WithGenerationKeyArn(const char* value) { SetGenerationKeyArn(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The key check value (KCV) of the encryption key. The KCV is used to check if
+     * all parties holding a given key have the same key or to detect that a key has
+     * changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV
+     * according to the CMAC specification.</p>
+     */
+    inline const Aws::String& GetGenerationKeyCheckValue() const{ return m_generationKeyCheckValue; }
+    inline void SetGenerationKeyCheckValue(const Aws::String& value) { m_generationKeyCheckValue = value; }
+    inline void SetGenerationKeyCheckValue(Aws::String&& value) { m_generationKeyCheckValue = std::move(value); }
+    inline void SetGenerationKeyCheckValue(const char* value) { m_generationKeyCheckValue.assign(value); }
+    inline GeneratePinDataResult& WithGenerationKeyCheckValue(const Aws::String& value) { SetGenerationKeyCheckValue(value); return *this;}
+    inline GeneratePinDataResult& WithGenerationKeyCheckValue(Aws::String&& value) { SetGenerationKeyCheckValue(std::move(value)); return *this;}
+    inline GeneratePinDataResult& WithGenerationKeyCheckValue(const char* value) { SetGenerationKeyCheckValue(value); return *this;}
     ///@}
 
     ///@{
@@ -81,32 +95,18 @@ namespace Model
 
     ///@{
     /**
-     * <p>The <code>keyARN</code> of the pin data generation key that Amazon Web
-     * Services Payment Cryptography uses for PIN, PVV or PIN Offset generation.</p>
-     */
-    inline const Aws::String& GetGenerationKeyArn() const{ return m_generationKeyArn; }
-    inline void SetGenerationKeyArn(const Aws::String& value) { m_generationKeyArn = value; }
-    inline void SetGenerationKeyArn(Aws::String&& value) { m_generationKeyArn = std::move(value); }
-    inline void SetGenerationKeyArn(const char* value) { m_generationKeyArn.assign(value); }
-    inline GeneratePinDataResult& WithGenerationKeyArn(const Aws::String& value) { SetGenerationKeyArn(value); return *this;}
-    inline GeneratePinDataResult& WithGenerationKeyArn(Aws::String&& value) { SetGenerationKeyArn(std::move(value)); return *this;}
-    inline GeneratePinDataResult& WithGenerationKeyArn(const char* value) { SetGenerationKeyArn(value); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>The key check value (KCV) of the encryption key. The KCV is used to check if
-     * all parties holding a given key have the same key or to detect that a key has
-     * changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV
-     * according to the CMAC specification.</p>
+     * <p>The PIN block encrypted under PEK from Amazon Web Services Payment
+     * Cryptography. The encrypted PIN block is a composite of PAN (Primary Account
+     * Number) and PIN (Personal Identification Number), generated in accordance with
+     * ISO 9564 standard.</p>
      */
-    inline const Aws::String& GetGenerationKeyCheckValue() const{ return m_generationKeyCheckValue; }
-    inline void SetGenerationKeyCheckValue(const Aws::String& value) { m_generationKeyCheckValue = value; }
-    inline void SetGenerationKeyCheckValue(Aws::String&& value) { m_generationKeyCheckValue = std::move(value); }
-    inline void SetGenerationKeyCheckValue(const char* value) { m_generationKeyCheckValue.assign(value); }
-    inline GeneratePinDataResult& WithGenerationKeyCheckValue(const Aws::String& value) { SetGenerationKeyCheckValue(value); return *this;}
-    inline GeneratePinDataResult& WithGenerationKeyCheckValue(Aws::String&& value) { SetGenerationKeyCheckValue(std::move(value)); return *this;}
-    inline GeneratePinDataResult& WithGenerationKeyCheckValue(const char* value) { SetGenerationKeyCheckValue(value); return *this;}
+    inline const Aws::String& GetEncryptedPinBlock() const{ return m_encryptedPinBlock; }
+    inline void SetEncryptedPinBlock(const Aws::String& value) { m_encryptedPinBlock = value; }
+    inline void SetEncryptedPinBlock(Aws::String&& value) { m_encryptedPinBlock = std::move(value); }
+    inline void SetEncryptedPinBlock(const char* value) { m_encryptedPinBlock.assign(value); }
+    inline GeneratePinDataResult& WithEncryptedPinBlock(const Aws::String& value) { SetEncryptedPinBlock(value); return *this;}
+    inline GeneratePinDataResult& WithEncryptedPinBlock(Aws::String&& value) { SetEncryptedPinBlock(std::move(value)); return *this;}
+    inline GeneratePinDataResult& WithEncryptedPinBlock(const char* value) { SetEncryptedPinBlock(value); return *this;}
     ///@}
 
     ///@{
@@ -133,15 +133,15 @@ namespace Model
     ///@}
   private:
 
-    Aws::String m_encryptedPinBlock;
+    Aws::String m_generationKeyArn;
+
+    Aws::String m_generationKeyCheckValue;
 
     Aws::String m_encryptionKeyArn;
 
     Aws::String m_encryptionKeyCheckValue;
 
-    Aws::String m_generationKeyArn;
-
-    Aws::String m_generationKeyCheckValue;
+    Aws::String m_encryptedPinBlock;
 
     PinData m_pinData;
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624NaturalPin.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624NaturalPin.h
index 13268a123b1..ae23289239d 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624NaturalPin.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624NaturalPin.h
@@ -54,20 +54,6 @@ namespace Model
     inline Ibm3624NaturalPin& WithDecimalizationTable(const char* value) { SetDecimalizationTable(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The unique data for cardholder identification.</p>
-     */
-    inline const Aws::String& GetPinValidationData() const{ return m_pinValidationData; }
-    inline bool PinValidationDataHasBeenSet() const { return m_pinValidationDataHasBeenSet; }
-    inline void SetPinValidationData(const Aws::String& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = value; }
-    inline void SetPinValidationData(Aws::String&& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = std::move(value); }
-    inline void SetPinValidationData(const char* value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData.assign(value); }
-    inline Ibm3624NaturalPin& WithPinValidationData(const Aws::String& value) { SetPinValidationData(value); return *this;}
-    inline Ibm3624NaturalPin& WithPinValidationData(Aws::String&& value) { SetPinValidationData(std::move(value)); return *this;}
-    inline Ibm3624NaturalPin& WithPinValidationData(const char* value) { SetPinValidationData(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The padding character for validation data.</p>
@@ -81,16 +67,30 @@ namespace Model
     inline Ibm3624NaturalPin& WithPinValidationDataPadCharacter(Aws::String&& value) { SetPinValidationDataPadCharacter(std::move(value)); return *this;}
     inline Ibm3624NaturalPin& WithPinValidationDataPadCharacter(const char* value) { SetPinValidationDataPadCharacter(value); return *this;}
     ///@}
+
+    ///@{
+    /**
+     * <p>The unique data for cardholder identification.</p>
+     */
+    inline const Aws::String& GetPinValidationData() const{ return m_pinValidationData; }
+    inline bool PinValidationDataHasBeenSet() const { return m_pinValidationDataHasBeenSet; }
+    inline void SetPinValidationData(const Aws::String& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = value; }
+    inline void SetPinValidationData(Aws::String&& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = std::move(value); }
+    inline void SetPinValidationData(const char* value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData.assign(value); }
+    inline Ibm3624NaturalPin& WithPinValidationData(const Aws::String& value) { SetPinValidationData(value); return *this;}
+    inline Ibm3624NaturalPin& WithPinValidationData(Aws::String&& value) { SetPinValidationData(std::move(value)); return *this;}
+    inline Ibm3624NaturalPin& WithPinValidationData(const char* value) { SetPinValidationData(value); return *this;}
+    ///@}
   private:
 
     Aws::String m_decimalizationTable;
     bool m_decimalizationTableHasBeenSet = false;
 
-    Aws::String m_pinValidationData;
-    bool m_pinValidationDataHasBeenSet = false;
-
     Aws::String m_pinValidationDataPadCharacter;
     bool m_pinValidationDataPadCharacterHasBeenSet = false;
+
+    Aws::String m_pinValidationData;
+    bool m_pinValidationDataHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinFromOffset.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinFromOffset.h
index bf8e6428e6a..926252e5d1e 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinFromOffset.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinFromOffset.h
@@ -56,16 +56,16 @@ namespace Model
 
     ///@{
     /**
-     * <p>The PIN offset value.</p>
+     * <p>The padding character for validation data.</p>
      */
-    inline const Aws::String& GetPinOffset() const{ return m_pinOffset; }
-    inline bool PinOffsetHasBeenSet() const { return m_pinOffsetHasBeenSet; }
-    inline void SetPinOffset(const Aws::String& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = value; }
-    inline void SetPinOffset(Aws::String&& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = std::move(value); }
-    inline void SetPinOffset(const char* value) { m_pinOffsetHasBeenSet = true; m_pinOffset.assign(value); }
-    inline Ibm3624PinFromOffset& WithPinOffset(const Aws::String& value) { SetPinOffset(value); return *this;}
-    inline Ibm3624PinFromOffset& WithPinOffset(Aws::String&& value) { SetPinOffset(std::move(value)); return *this;}
-    inline Ibm3624PinFromOffset& WithPinOffset(const char* value) { SetPinOffset(value); return *this;}
+    inline const Aws::String& GetPinValidationDataPadCharacter() const{ return m_pinValidationDataPadCharacter; }
+    inline bool PinValidationDataPadCharacterHasBeenSet() const { return m_pinValidationDataPadCharacterHasBeenSet; }
+    inline void SetPinValidationDataPadCharacter(const Aws::String& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = value; }
+    inline void SetPinValidationDataPadCharacter(Aws::String&& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = std::move(value); }
+    inline void SetPinValidationDataPadCharacter(const char* value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter.assign(value); }
+    inline Ibm3624PinFromOffset& WithPinValidationDataPadCharacter(const Aws::String& value) { SetPinValidationDataPadCharacter(value); return *this;}
+    inline Ibm3624PinFromOffset& WithPinValidationDataPadCharacter(Aws::String&& value) { SetPinValidationDataPadCharacter(std::move(value)); return *this;}
+    inline Ibm3624PinFromOffset& WithPinValidationDataPadCharacter(const char* value) { SetPinValidationDataPadCharacter(value); return *this;}
     ///@}
 
     ///@{
@@ -84,30 +84,30 @@ namespace Model
 
     ///@{
     /**
-     * <p>The padding character for validation data.</p>
+     * <p>The PIN offset value.</p>
      */
-    inline const Aws::String& GetPinValidationDataPadCharacter() const{ return m_pinValidationDataPadCharacter; }
-    inline bool PinValidationDataPadCharacterHasBeenSet() const { return m_pinValidationDataPadCharacterHasBeenSet; }
-    inline void SetPinValidationDataPadCharacter(const Aws::String& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = value; }
-    inline void SetPinValidationDataPadCharacter(Aws::String&& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = std::move(value); }
-    inline void SetPinValidationDataPadCharacter(const char* value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter.assign(value); }
-    inline Ibm3624PinFromOffset& WithPinValidationDataPadCharacter(const Aws::String& value) { SetPinValidationDataPadCharacter(value); return *this;}
-    inline Ibm3624PinFromOffset& WithPinValidationDataPadCharacter(Aws::String&& value) { SetPinValidationDataPadCharacter(std::move(value)); return *this;}
-    inline Ibm3624PinFromOffset& WithPinValidationDataPadCharacter(const char* value) { SetPinValidationDataPadCharacter(value); return *this;}
+    inline const Aws::String& GetPinOffset() const{ return m_pinOffset; }
+    inline bool PinOffsetHasBeenSet() const { return m_pinOffsetHasBeenSet; }
+    inline void SetPinOffset(const Aws::String& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = value; }
+    inline void SetPinOffset(Aws::String&& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = std::move(value); }
+    inline void SetPinOffset(const char* value) { m_pinOffsetHasBeenSet = true; m_pinOffset.assign(value); }
+    inline Ibm3624PinFromOffset& WithPinOffset(const Aws::String& value) { SetPinOffset(value); return *this;}
+    inline Ibm3624PinFromOffset& WithPinOffset(Aws::String&& value) { SetPinOffset(std::move(value)); return *this;}
+    inline Ibm3624PinFromOffset& WithPinOffset(const char* value) { SetPinOffset(value); return *this;}
     ///@}
   private:
 
     Aws::String m_decimalizationTable;
     bool m_decimalizationTableHasBeenSet = false;
 
-    Aws::String m_pinOffset;
-    bool m_pinOffsetHasBeenSet = false;
+    Aws::String m_pinValidationDataPadCharacter;
+    bool m_pinValidationDataPadCharacterHasBeenSet = false;
 
     Aws::String m_pinValidationData;
     bool m_pinValidationDataHasBeenSet = false;
 
-    Aws::String m_pinValidationDataPadCharacter;
-    bool m_pinValidationDataPadCharacterHasBeenSet = false;
+    Aws::String m_pinOffset;
+    bool m_pinOffsetHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinOffset.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinOffset.h
index 8662ff2db97..855e3a13ff3 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinOffset.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinOffset.h
@@ -38,22 +38,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used
-     * to convert the algorithm intermediate result from hexadecimal characters to
-     * decimal.</p>
-     */
-    inline const Aws::String& GetDecimalizationTable() const{ return m_decimalizationTable; }
-    inline bool DecimalizationTableHasBeenSet() const { return m_decimalizationTableHasBeenSet; }
-    inline void SetDecimalizationTable(const Aws::String& value) { m_decimalizationTableHasBeenSet = true; m_decimalizationTable = value; }
-    inline void SetDecimalizationTable(Aws::String&& value) { m_decimalizationTableHasBeenSet = true; m_decimalizationTable = std::move(value); }
-    inline void SetDecimalizationTable(const char* value) { m_decimalizationTableHasBeenSet = true; m_decimalizationTable.assign(value); }
-    inline Ibm3624PinOffset& WithDecimalizationTable(const Aws::String& value) { SetDecimalizationTable(value); return *this;}
-    inline Ibm3624PinOffset& WithDecimalizationTable(Aws::String&& value) { SetDecimalizationTable(std::move(value)); return *this;}
-    inline Ibm3624PinOffset& WithDecimalizationTable(const char* value) { SetDecimalizationTable(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The encrypted PIN block data. According to ISO 9564 standard, a PIN Block is
@@ -72,16 +56,18 @@ namespace Model
 
     ///@{
     /**
-     * <p>The unique data for cardholder identification.</p>
+     * <p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used
+     * to convert the algorithm intermediate result from hexadecimal characters to
+     * decimal.</p>
      */
-    inline const Aws::String& GetPinValidationData() const{ return m_pinValidationData; }
-    inline bool PinValidationDataHasBeenSet() const { return m_pinValidationDataHasBeenSet; }
-    inline void SetPinValidationData(const Aws::String& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = value; }
-    inline void SetPinValidationData(Aws::String&& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = std::move(value); }
-    inline void SetPinValidationData(const char* value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData.assign(value); }
-    inline Ibm3624PinOffset& WithPinValidationData(const Aws::String& value) { SetPinValidationData(value); return *this;}
-    inline Ibm3624PinOffset& WithPinValidationData(Aws::String&& value) { SetPinValidationData(std::move(value)); return *this;}
-    inline Ibm3624PinOffset& WithPinValidationData(const char* value) { SetPinValidationData(value); return *this;}
+    inline const Aws::String& GetDecimalizationTable() const{ return m_decimalizationTable; }
+    inline bool DecimalizationTableHasBeenSet() const { return m_decimalizationTableHasBeenSet; }
+    inline void SetDecimalizationTable(const Aws::String& value) { m_decimalizationTableHasBeenSet = true; m_decimalizationTable = value; }
+    inline void SetDecimalizationTable(Aws::String&& value) { m_decimalizationTableHasBeenSet = true; m_decimalizationTable = std::move(value); }
+    inline void SetDecimalizationTable(const char* value) { m_decimalizationTableHasBeenSet = true; m_decimalizationTable.assign(value); }
+    inline Ibm3624PinOffset& WithDecimalizationTable(const Aws::String& value) { SetDecimalizationTable(value); return *this;}
+    inline Ibm3624PinOffset& WithDecimalizationTable(Aws::String&& value) { SetDecimalizationTable(std::move(value)); return *this;}
+    inline Ibm3624PinOffset& WithDecimalizationTable(const char* value) { SetDecimalizationTable(value); return *this;}
     ///@}
 
     ///@{
@@ -97,19 +83,33 @@ namespace Model
     inline Ibm3624PinOffset& WithPinValidationDataPadCharacter(Aws::String&& value) { SetPinValidationDataPadCharacter(std::move(value)); return *this;}
     inline Ibm3624PinOffset& WithPinValidationDataPadCharacter(const char* value) { SetPinValidationDataPadCharacter(value); return *this;}
     ///@}
-  private:
 
-    Aws::String m_decimalizationTable;
-    bool m_decimalizationTableHasBeenSet = false;
+    ///@{
+    /**
+     * <p>The unique data for cardholder identification.</p>
+     */
+    inline const Aws::String& GetPinValidationData() const{ return m_pinValidationData; }
+    inline bool PinValidationDataHasBeenSet() const { return m_pinValidationDataHasBeenSet; }
+    inline void SetPinValidationData(const Aws::String& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = value; }
+    inline void SetPinValidationData(Aws::String&& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = std::move(value); }
+    inline void SetPinValidationData(const char* value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData.assign(value); }
+    inline Ibm3624PinOffset& WithPinValidationData(const Aws::String& value) { SetPinValidationData(value); return *this;}
+    inline Ibm3624PinOffset& WithPinValidationData(Aws::String&& value) { SetPinValidationData(std::move(value)); return *this;}
+    inline Ibm3624PinOffset& WithPinValidationData(const char* value) { SetPinValidationData(value); return *this;}
+    ///@}
+  private:
 
     Aws::String m_encryptedPinBlock;
     bool m_encryptedPinBlockHasBeenSet = false;
 
-    Aws::String m_pinValidationData;
-    bool m_pinValidationDataHasBeenSet = false;
+    Aws::String m_decimalizationTable;
+    bool m_decimalizationTableHasBeenSet = false;
 
     Aws::String m_pinValidationDataPadCharacter;
     bool m_pinValidationDataPadCharacterHasBeenSet = false;
+
+    Aws::String m_pinValidationData;
+    bool m_pinValidationDataHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinVerification.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinVerification.h
index 0ecd6111d0a..a3c776edd7d 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinVerification.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624PinVerification.h
@@ -56,16 +56,16 @@ namespace Model
 
     ///@{
     /**
-     * <p>The PIN offset value.</p>
+     * <p>The padding character for validation data.</p>
      */
-    inline const Aws::String& GetPinOffset() const{ return m_pinOffset; }
-    inline bool PinOffsetHasBeenSet() const { return m_pinOffsetHasBeenSet; }
-    inline void SetPinOffset(const Aws::String& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = value; }
-    inline void SetPinOffset(Aws::String&& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = std::move(value); }
-    inline void SetPinOffset(const char* value) { m_pinOffsetHasBeenSet = true; m_pinOffset.assign(value); }
-    inline Ibm3624PinVerification& WithPinOffset(const Aws::String& value) { SetPinOffset(value); return *this;}
-    inline Ibm3624PinVerification& WithPinOffset(Aws::String&& value) { SetPinOffset(std::move(value)); return *this;}
-    inline Ibm3624PinVerification& WithPinOffset(const char* value) { SetPinOffset(value); return *this;}
+    inline const Aws::String& GetPinValidationDataPadCharacter() const{ return m_pinValidationDataPadCharacter; }
+    inline bool PinValidationDataPadCharacterHasBeenSet() const { return m_pinValidationDataPadCharacterHasBeenSet; }
+    inline void SetPinValidationDataPadCharacter(const Aws::String& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = value; }
+    inline void SetPinValidationDataPadCharacter(Aws::String&& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = std::move(value); }
+    inline void SetPinValidationDataPadCharacter(const char* value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter.assign(value); }
+    inline Ibm3624PinVerification& WithPinValidationDataPadCharacter(const Aws::String& value) { SetPinValidationDataPadCharacter(value); return *this;}
+    inline Ibm3624PinVerification& WithPinValidationDataPadCharacter(Aws::String&& value) { SetPinValidationDataPadCharacter(std::move(value)); return *this;}
+    inline Ibm3624PinVerification& WithPinValidationDataPadCharacter(const char* value) { SetPinValidationDataPadCharacter(value); return *this;}
     ///@}
 
     ///@{
@@ -84,30 +84,30 @@ namespace Model
 
     ///@{
     /**
-     * <p>The padding character for validation data.</p>
+     * <p>The PIN offset value.</p>
      */
-    inline const Aws::String& GetPinValidationDataPadCharacter() const{ return m_pinValidationDataPadCharacter; }
-    inline bool PinValidationDataPadCharacterHasBeenSet() const { return m_pinValidationDataPadCharacterHasBeenSet; }
-    inline void SetPinValidationDataPadCharacter(const Aws::String& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = value; }
-    inline void SetPinValidationDataPadCharacter(Aws::String&& value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter = std::move(value); }
-    inline void SetPinValidationDataPadCharacter(const char* value) { m_pinValidationDataPadCharacterHasBeenSet = true; m_pinValidationDataPadCharacter.assign(value); }
-    inline Ibm3624PinVerification& WithPinValidationDataPadCharacter(const Aws::String& value) { SetPinValidationDataPadCharacter(value); return *this;}
-    inline Ibm3624PinVerification& WithPinValidationDataPadCharacter(Aws::String&& value) { SetPinValidationDataPadCharacter(std::move(value)); return *this;}
-    inline Ibm3624PinVerification& WithPinValidationDataPadCharacter(const char* value) { SetPinValidationDataPadCharacter(value); return *this;}
+    inline const Aws::String& GetPinOffset() const{ return m_pinOffset; }
+    inline bool PinOffsetHasBeenSet() const { return m_pinOffsetHasBeenSet; }
+    inline void SetPinOffset(const Aws::String& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = value; }
+    inline void SetPinOffset(Aws::String&& value) { m_pinOffsetHasBeenSet = true; m_pinOffset = std::move(value); }
+    inline void SetPinOffset(const char* value) { m_pinOffsetHasBeenSet = true; m_pinOffset.assign(value); }
+    inline Ibm3624PinVerification& WithPinOffset(const Aws::String& value) { SetPinOffset(value); return *this;}
+    inline Ibm3624PinVerification& WithPinOffset(Aws::String&& value) { SetPinOffset(std::move(value)); return *this;}
+    inline Ibm3624PinVerification& WithPinOffset(const char* value) { SetPinOffset(value); return *this;}
     ///@}
   private:
 
     Aws::String m_decimalizationTable;
     bool m_decimalizationTableHasBeenSet = false;
 
-    Aws::String m_pinOffset;
-    bool m_pinOffsetHasBeenSet = false;
+    Aws::String m_pinValidationDataPadCharacter;
+    bool m_pinValidationDataPadCharacterHasBeenSet = false;
 
     Aws::String m_pinValidationData;
     bool m_pinValidationDataHasBeenSet = false;
 
-    Aws::String m_pinValidationDataPadCharacter;
-    bool m_pinValidationDataPadCharacterHasBeenSet = false;
+    Aws::String m_pinOffset;
+    bool m_pinOffsetHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624RandomPin.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624RandomPin.h
index cb66b52f53c..6512d7441f5 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624RandomPin.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/Ibm3624RandomPin.h
@@ -54,20 +54,6 @@ namespace Model
     inline Ibm3624RandomPin& WithDecimalizationTable(const char* value) { SetDecimalizationTable(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The unique data for cardholder identification.</p>
-     */
-    inline const Aws::String& GetPinValidationData() const{ return m_pinValidationData; }
-    inline bool PinValidationDataHasBeenSet() const { return m_pinValidationDataHasBeenSet; }
-    inline void SetPinValidationData(const Aws::String& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = value; }
-    inline void SetPinValidationData(Aws::String&& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = std::move(value); }
-    inline void SetPinValidationData(const char* value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData.assign(value); }
-    inline Ibm3624RandomPin& WithPinValidationData(const Aws::String& value) { SetPinValidationData(value); return *this;}
-    inline Ibm3624RandomPin& WithPinValidationData(Aws::String&& value) { SetPinValidationData(std::move(value)); return *this;}
-    inline Ibm3624RandomPin& WithPinValidationData(const char* value) { SetPinValidationData(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The padding character for validation data.</p>
@@ -81,16 +67,30 @@ namespace Model
     inline Ibm3624RandomPin& WithPinValidationDataPadCharacter(Aws::String&& value) { SetPinValidationDataPadCharacter(std::move(value)); return *this;}
     inline Ibm3624RandomPin& WithPinValidationDataPadCharacter(const char* value) { SetPinValidationDataPadCharacter(value); return *this;}
     ///@}
+
+    ///@{
+    /**
+     * <p>The unique data for cardholder identification.</p>
+     */
+    inline const Aws::String& GetPinValidationData() const{ return m_pinValidationData; }
+    inline bool PinValidationDataHasBeenSet() const { return m_pinValidationDataHasBeenSet; }
+    inline void SetPinValidationData(const Aws::String& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = value; }
+    inline void SetPinValidationData(Aws::String&& value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData = std::move(value); }
+    inline void SetPinValidationData(const char* value) { m_pinValidationDataHasBeenSet = true; m_pinValidationData.assign(value); }
+    inline Ibm3624RandomPin& WithPinValidationData(const Aws::String& value) { SetPinValidationData(value); return *this;}
+    inline Ibm3624RandomPin& WithPinValidationData(Aws::String&& value) { SetPinValidationData(std::move(value)); return *this;}
+    inline Ibm3624RandomPin& WithPinValidationData(const char* value) { SetPinValidationData(value); return *this;}
+    ///@}
   private:
 
     Aws::String m_decimalizationTable;
     bool m_decimalizationTableHasBeenSet = false;
 
-    Aws::String m_pinValidationData;
-    bool m_pinValidationDataHasBeenSet = false;
-
     Aws::String m_pinValidationDataPadCharacter;
     bool m_pinValidationDataPadCharacterHasBeenSet = false;
+
+    Aws::String m_pinValidationData;
+    bool m_pinValidationDataHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/KeyCheckValueAlgorithm.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/KeyCheckValueAlgorithm.h
new file mode 100644
index 00000000000..a46faec8fff
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/KeyCheckValueAlgorithm.h
@@ -0,0 +1,31 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace PaymentCryptographyData
+{
+namespace Model
+{
+  enum class KeyCheckValueAlgorithm
+  {
+    NOT_SET,
+    CMAC,
+    ANSI_X9_24
+  };
+
+namespace KeyCheckValueAlgorithmMapper
+{
+AWS_PAYMENTCRYPTOGRAPHYDATA_API KeyCheckValueAlgorithm GetKeyCheckValueAlgorithmForName(const Aws::String& name);
+
+AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String GetNameForKeyCheckValueAlgorithm(KeyCheckValueAlgorithm value);
+} // namespace KeyCheckValueAlgorithmMapper
+} // namespace Model
+} // namespace PaymentCryptographyData
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmDukpt.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmDukpt.h
index ede28526e5b..5bae43ba641 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmDukpt.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmDukpt.h
@@ -5,9 +5,9 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/payment-cryptography-data/model/DukptDerivationType.h>
-#include <aws/payment-cryptography-data/model/DukptKeyVariant.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/payment-cryptography-data/model/DukptKeyVariant.h>
+#include <aws/payment-cryptography-data/model/DukptDerivationType.h>
 #include <utility>
 
 namespace Aws
@@ -42,17 +42,18 @@ namespace Model
 
     ///@{
     /**
-     * <p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key
-     * Serial Number (KSN). This must be less than or equal to the strength of the BDK.
-     * For example, you can't use <code>AES_128</code> as a derivation type for a BDK
-     * of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>
+     * <p>The unique identifier known as Key Serial Number (KSN) that comes from an
+     * encrypting device using DUKPT encryption method. The KSN is derived from the
+     * encrypting device unique identifier and an internal transaction counter.</p>
      */
-    inline const DukptDerivationType& GetDukptDerivationType() const{ return m_dukptDerivationType; }
-    inline bool DukptDerivationTypeHasBeenSet() const { return m_dukptDerivationTypeHasBeenSet; }
-    inline void SetDukptDerivationType(const DukptDerivationType& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = value; }
-    inline void SetDukptDerivationType(DukptDerivationType&& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = std::move(value); }
-    inline MacAlgorithmDukpt& WithDukptDerivationType(const DukptDerivationType& value) { SetDukptDerivationType(value); return *this;}
-    inline MacAlgorithmDukpt& WithDukptDerivationType(DukptDerivationType&& value) { SetDukptDerivationType(std::move(value)); return *this;}
+    inline const Aws::String& GetKeySerialNumber() const{ return m_keySerialNumber; }
+    inline bool KeySerialNumberHasBeenSet() const { return m_keySerialNumberHasBeenSet; }
+    inline void SetKeySerialNumber(const Aws::String& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = value; }
+    inline void SetKeySerialNumber(Aws::String&& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = std::move(value); }
+    inline void SetKeySerialNumber(const char* value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber.assign(value); }
+    inline MacAlgorithmDukpt& WithKeySerialNumber(const Aws::String& value) { SetKeySerialNumber(value); return *this;}
+    inline MacAlgorithmDukpt& WithKeySerialNumber(Aws::String&& value) { SetKeySerialNumber(std::move(value)); return *this;}
+    inline MacAlgorithmDukpt& WithKeySerialNumber(const char* value) { SetKeySerialNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -70,29 +71,28 @@ namespace Model
 
     ///@{
     /**
-     * <p>The unique identifier known as Key Serial Number (KSN) that comes from an
-     * encrypting device using DUKPT encryption method. The KSN is derived from the
-     * encrypting device unique identifier and an internal transaction counter.</p>
+     * <p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key
+     * Serial Number (KSN). This must be less than or equal to the strength of the BDK.
+     * For example, you can't use <code>AES_128</code> as a derivation type for a BDK
+     * of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>
      */
-    inline const Aws::String& GetKeySerialNumber() const{ return m_keySerialNumber; }
-    inline bool KeySerialNumberHasBeenSet() const { return m_keySerialNumberHasBeenSet; }
-    inline void SetKeySerialNumber(const Aws::String& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = value; }
-    inline void SetKeySerialNumber(Aws::String&& value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber = std::move(value); }
-    inline void SetKeySerialNumber(const char* value) { m_keySerialNumberHasBeenSet = true; m_keySerialNumber.assign(value); }
-    inline MacAlgorithmDukpt& WithKeySerialNumber(const Aws::String& value) { SetKeySerialNumber(value); return *this;}
-    inline MacAlgorithmDukpt& WithKeySerialNumber(Aws::String&& value) { SetKeySerialNumber(std::move(value)); return *this;}
-    inline MacAlgorithmDukpt& WithKeySerialNumber(const char* value) { SetKeySerialNumber(value); return *this;}
+    inline const DukptDerivationType& GetDukptDerivationType() const{ return m_dukptDerivationType; }
+    inline bool DukptDerivationTypeHasBeenSet() const { return m_dukptDerivationTypeHasBeenSet; }
+    inline void SetDukptDerivationType(const DukptDerivationType& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = value; }
+    inline void SetDukptDerivationType(DukptDerivationType&& value) { m_dukptDerivationTypeHasBeenSet = true; m_dukptDerivationType = std::move(value); }
+    inline MacAlgorithmDukpt& WithDukptDerivationType(const DukptDerivationType& value) { SetDukptDerivationType(value); return *this;}
+    inline MacAlgorithmDukpt& WithDukptDerivationType(DukptDerivationType&& value) { SetDukptDerivationType(std::move(value)); return *this;}
     ///@}
   private:
 
-    DukptDerivationType m_dukptDerivationType;
-    bool m_dukptDerivationTypeHasBeenSet = false;
+    Aws::String m_keySerialNumber;
+    bool m_keySerialNumberHasBeenSet = false;
 
     DukptKeyVariant m_dukptKeyVariant;
     bool m_dukptKeyVariantHasBeenSet = false;
 
-    Aws::String m_keySerialNumber;
-    bool m_keySerialNumberHasBeenSet = false;
+    DukptDerivationType m_dukptDerivationType;
+    bool m_dukptDerivationTypeHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmEmv.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmEmv.h
index 363df17305e..13e0c198c69 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmEmv.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAlgorithmEmv.h
@@ -54,21 +54,6 @@ namespace Model
     inline MacAlgorithmEmv& WithMajorKeyDerivationMode(MajorKeyDerivationMode&& value) { SetMajorKeyDerivationMode(std::move(value)); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>A number that identifies and differentiates payment cards with the same
-     * Primary Account Number (PAN).</p>
-     */
-    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
-    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
-    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
-    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
-    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
-    inline MacAlgorithmEmv& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
-    inline MacAlgorithmEmv& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
-    inline MacAlgorithmEmv& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The Primary Account Number (PAN), a unique identifier for a payment credit or
@@ -84,6 +69,21 @@ namespace Model
     inline MacAlgorithmEmv& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>A number that identifies and differentiates payment cards with the same
+     * Primary Account Number (PAN).</p>
+     */
+    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
+    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
+    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
+    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
+    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
+    inline MacAlgorithmEmv& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
+    inline MacAlgorithmEmv& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
+    inline MacAlgorithmEmv& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The method of deriving a session key for EMV MAC generation or
@@ -114,12 +114,12 @@ namespace Model
     MajorKeyDerivationMode m_majorKeyDerivationMode;
     bool m_majorKeyDerivationModeHasBeenSet = false;
 
-    Aws::String m_panSequenceNumber;
-    bool m_panSequenceNumberHasBeenSet = false;
-
     Aws::String m_primaryAccountNumber;
     bool m_primaryAccountNumberHasBeenSet = false;
 
+    Aws::String m_panSequenceNumber;
+    bool m_panSequenceNumberHasBeenSet = false;
+
     SessionKeyDerivationMode m_sessionKeyDerivationMode;
     bool m_sessionKeyDerivationModeHasBeenSet = false;
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAttributes.h
index 7ceca28b0e4..2925827cfa2 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/MacAttributes.h
@@ -6,8 +6,8 @@
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/model/MacAlgorithm.h>
-#include <aws/payment-cryptography-data/model/MacAlgorithmDukpt.h>
 #include <aws/payment-cryptography-data/model/MacAlgorithmEmv.h>
+#include <aws/payment-cryptography-data/model/MacAlgorithmDukpt.h>
 #include <utility>
 
 namespace Aws
@@ -54,15 +54,15 @@ namespace Model
 
     ///@{
     /**
-     * <p>Parameters that are required for MAC generation or verification using DUKPT
-     * CMAC algorithm.</p>
+     * <p>Parameters that are required for MAC generation or verification using EMV MAC
+     * algorithm.</p>
      */
-    inline const MacAlgorithmDukpt& GetDukptCmac() const{ return m_dukptCmac; }
-    inline bool DukptCmacHasBeenSet() const { return m_dukptCmacHasBeenSet; }
-    inline void SetDukptCmac(const MacAlgorithmDukpt& value) { m_dukptCmacHasBeenSet = true; m_dukptCmac = value; }
-    inline void SetDukptCmac(MacAlgorithmDukpt&& value) { m_dukptCmacHasBeenSet = true; m_dukptCmac = std::move(value); }
-    inline MacAttributes& WithDukptCmac(const MacAlgorithmDukpt& value) { SetDukptCmac(value); return *this;}
-    inline MacAttributes& WithDukptCmac(MacAlgorithmDukpt&& value) { SetDukptCmac(std::move(value)); return *this;}
+    inline const MacAlgorithmEmv& GetEmvMac() const{ return m_emvMac; }
+    inline bool EmvMacHasBeenSet() const { return m_emvMacHasBeenSet; }
+    inline void SetEmvMac(const MacAlgorithmEmv& value) { m_emvMacHasBeenSet = true; m_emvMac = value; }
+    inline void SetEmvMac(MacAlgorithmEmv&& value) { m_emvMacHasBeenSet = true; m_emvMac = std::move(value); }
+    inline MacAttributes& WithEmvMac(const MacAlgorithmEmv& value) { SetEmvMac(value); return *this;}
+    inline MacAttributes& WithEmvMac(MacAlgorithmEmv&& value) { SetEmvMac(std::move(value)); return *this;}
     ///@}
 
     ///@{
@@ -93,23 +93,23 @@ namespace Model
 
     ///@{
     /**
-     * <p>Parameters that are required for MAC generation or verification using EMV MAC
-     * algorithm.</p>
+     * <p>Parameters that are required for MAC generation or verification using DUKPT
+     * CMAC algorithm.</p>
      */
-    inline const MacAlgorithmEmv& GetEmvMac() const{ return m_emvMac; }
-    inline bool EmvMacHasBeenSet() const { return m_emvMacHasBeenSet; }
-    inline void SetEmvMac(const MacAlgorithmEmv& value) { m_emvMacHasBeenSet = true; m_emvMac = value; }
-    inline void SetEmvMac(MacAlgorithmEmv&& value) { m_emvMacHasBeenSet = true; m_emvMac = std::move(value); }
-    inline MacAttributes& WithEmvMac(const MacAlgorithmEmv& value) { SetEmvMac(value); return *this;}
-    inline MacAttributes& WithEmvMac(MacAlgorithmEmv&& value) { SetEmvMac(std::move(value)); return *this;}
+    inline const MacAlgorithmDukpt& GetDukptCmac() const{ return m_dukptCmac; }
+    inline bool DukptCmacHasBeenSet() const { return m_dukptCmacHasBeenSet; }
+    inline void SetDukptCmac(const MacAlgorithmDukpt& value) { m_dukptCmacHasBeenSet = true; m_dukptCmac = value; }
+    inline void SetDukptCmac(MacAlgorithmDukpt&& value) { m_dukptCmacHasBeenSet = true; m_dukptCmac = std::move(value); }
+    inline MacAttributes& WithDukptCmac(const MacAlgorithmDukpt& value) { SetDukptCmac(value); return *this;}
+    inline MacAttributes& WithDukptCmac(MacAlgorithmDukpt&& value) { SetDukptCmac(std::move(value)); return *this;}
     ///@}
   private:
 
     MacAlgorithm m_algorithm;
     bool m_algorithmHasBeenSet = false;
 
-    MacAlgorithmDukpt m_dukptCmac;
-    bool m_dukptCmacHasBeenSet = false;
+    MacAlgorithmEmv m_emvMac;
+    bool m_emvMacHasBeenSet = false;
 
     MacAlgorithmDukpt m_dukptIso9797Algorithm1;
     bool m_dukptIso9797Algorithm1HasBeenSet = false;
@@ -117,8 +117,8 @@ namespace Model
     MacAlgorithmDukpt m_dukptIso9797Algorithm3;
     bool m_dukptIso9797Algorithm3HasBeenSet = false;
 
-    MacAlgorithmEmv m_emvMac;
-    bool m_emvMacHasBeenSet = false;
+    MacAlgorithmDukpt m_dukptCmac;
+    bool m_dukptCmacHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinGenerationAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinGenerationAttributes.h
index ad472824ff0..d27eb7b2767 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinGenerationAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinGenerationAttributes.h
@@ -5,12 +5,12 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/payment-cryptography-data/model/Ibm3624NaturalPin.h>
-#include <aws/payment-cryptography-data/model/Ibm3624PinFromOffset.h>
-#include <aws/payment-cryptography-data/model/Ibm3624PinOffset.h>
-#include <aws/payment-cryptography-data/model/Ibm3624RandomPin.h>
 #include <aws/payment-cryptography-data/model/VisaPin.h>
 #include <aws/payment-cryptography-data/model/VisaPinVerificationValue.h>
+#include <aws/payment-cryptography-data/model/Ibm3624PinOffset.h>
+#include <aws/payment-cryptography-data/model/Ibm3624NaturalPin.h>
+#include <aws/payment-cryptography-data/model/Ibm3624RandomPin.h>
+#include <aws/payment-cryptography-data/model/Ibm3624PinFromOffset.h>
 #include <utility>
 
 namespace Aws
@@ -45,27 +45,27 @@ namespace Model
 
     ///@{
     /**
-     * <p>Parameters that are required to generate or verify Ibm3624 natural PIN.</p>
+     * <p>Parameters that are required to generate or verify Visa PIN.</p>
      */
-    inline const Ibm3624NaturalPin& GetIbm3624NaturalPin() const{ return m_ibm3624NaturalPin; }
-    inline bool Ibm3624NaturalPinHasBeenSet() const { return m_ibm3624NaturalPinHasBeenSet; }
-    inline void SetIbm3624NaturalPin(const Ibm3624NaturalPin& value) { m_ibm3624NaturalPinHasBeenSet = true; m_ibm3624NaturalPin = value; }
-    inline void SetIbm3624NaturalPin(Ibm3624NaturalPin&& value) { m_ibm3624NaturalPinHasBeenSet = true; m_ibm3624NaturalPin = std::move(value); }
-    inline PinGenerationAttributes& WithIbm3624NaturalPin(const Ibm3624NaturalPin& value) { SetIbm3624NaturalPin(value); return *this;}
-    inline PinGenerationAttributes& WithIbm3624NaturalPin(Ibm3624NaturalPin&& value) { SetIbm3624NaturalPin(std::move(value)); return *this;}
+    inline const VisaPin& GetVisaPin() const{ return m_visaPin; }
+    inline bool VisaPinHasBeenSet() const { return m_visaPinHasBeenSet; }
+    inline void SetVisaPin(const VisaPin& value) { m_visaPinHasBeenSet = true; m_visaPin = value; }
+    inline void SetVisaPin(VisaPin&& value) { m_visaPinHasBeenSet = true; m_visaPin = std::move(value); }
+    inline PinGenerationAttributes& WithVisaPin(const VisaPin& value) { SetVisaPin(value); return *this;}
+    inline PinGenerationAttributes& WithVisaPin(VisaPin&& value) { SetVisaPin(std::move(value)); return *this;}
     ///@}
 
     ///@{
     /**
-     * <p>Parameters that are required to generate or verify Ibm3624 PIN from offset
-     * PIN.</p>
+     * <p>Parameters that are required to generate or verify Visa PIN Verification
+     * Value (PVV).</p>
      */
-    inline const Ibm3624PinFromOffset& GetIbm3624PinFromOffset() const{ return m_ibm3624PinFromOffset; }
-    inline bool Ibm3624PinFromOffsetHasBeenSet() const { return m_ibm3624PinFromOffsetHasBeenSet; }
-    inline void SetIbm3624PinFromOffset(const Ibm3624PinFromOffset& value) { m_ibm3624PinFromOffsetHasBeenSet = true; m_ibm3624PinFromOffset = value; }
-    inline void SetIbm3624PinFromOffset(Ibm3624PinFromOffset&& value) { m_ibm3624PinFromOffsetHasBeenSet = true; m_ibm3624PinFromOffset = std::move(value); }
-    inline PinGenerationAttributes& WithIbm3624PinFromOffset(const Ibm3624PinFromOffset& value) { SetIbm3624PinFromOffset(value); return *this;}
-    inline PinGenerationAttributes& WithIbm3624PinFromOffset(Ibm3624PinFromOffset&& value) { SetIbm3624PinFromOffset(std::move(value)); return *this;}
+    inline const VisaPinVerificationValue& GetVisaPinVerificationValue() const{ return m_visaPinVerificationValue; }
+    inline bool VisaPinVerificationValueHasBeenSet() const { return m_visaPinVerificationValueHasBeenSet; }
+    inline void SetVisaPinVerificationValue(const VisaPinVerificationValue& value) { m_visaPinVerificationValueHasBeenSet = true; m_visaPinVerificationValue = value; }
+    inline void SetVisaPinVerificationValue(VisaPinVerificationValue&& value) { m_visaPinVerificationValueHasBeenSet = true; m_visaPinVerificationValue = std::move(value); }
+    inline PinGenerationAttributes& WithVisaPinVerificationValue(const VisaPinVerificationValue& value) { SetVisaPinVerificationValue(value); return *this;}
+    inline PinGenerationAttributes& WithVisaPinVerificationValue(VisaPinVerificationValue&& value) { SetVisaPinVerificationValue(std::move(value)); return *this;}
     ///@}
 
     ///@{
@@ -81,6 +81,18 @@ namespace Model
     inline PinGenerationAttributes& WithIbm3624PinOffset(Ibm3624PinOffset&& value) { SetIbm3624PinOffset(std::move(value)); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>Parameters that are required to generate or verify Ibm3624 natural PIN.</p>
+     */
+    inline const Ibm3624NaturalPin& GetIbm3624NaturalPin() const{ return m_ibm3624NaturalPin; }
+    inline bool Ibm3624NaturalPinHasBeenSet() const { return m_ibm3624NaturalPinHasBeenSet; }
+    inline void SetIbm3624NaturalPin(const Ibm3624NaturalPin& value) { m_ibm3624NaturalPinHasBeenSet = true; m_ibm3624NaturalPin = value; }
+    inline void SetIbm3624NaturalPin(Ibm3624NaturalPin&& value) { m_ibm3624NaturalPinHasBeenSet = true; m_ibm3624NaturalPin = std::move(value); }
+    inline PinGenerationAttributes& WithIbm3624NaturalPin(const Ibm3624NaturalPin& value) { SetIbm3624NaturalPin(value); return *this;}
+    inline PinGenerationAttributes& WithIbm3624NaturalPin(Ibm3624NaturalPin&& value) { SetIbm3624NaturalPin(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>Parameters that are required to generate or verify Ibm3624 random PIN.</p>
@@ -95,47 +107,35 @@ namespace Model
 
     ///@{
     /**
-     * <p>Parameters that are required to generate or verify Visa PIN.</p>
-     */
-    inline const VisaPin& GetVisaPin() const{ return m_visaPin; }
-    inline bool VisaPinHasBeenSet() const { return m_visaPinHasBeenSet; }
-    inline void SetVisaPin(const VisaPin& value) { m_visaPinHasBeenSet = true; m_visaPin = value; }
-    inline void SetVisaPin(VisaPin&& value) { m_visaPinHasBeenSet = true; m_visaPin = std::move(value); }
-    inline PinGenerationAttributes& WithVisaPin(const VisaPin& value) { SetVisaPin(value); return *this;}
-    inline PinGenerationAttributes& WithVisaPin(VisaPin&& value) { SetVisaPin(std::move(value)); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>Parameters that are required to generate or verify Visa PIN Verification
-     * Value (PVV).</p>
+     * <p>Parameters that are required to generate or verify Ibm3624 PIN from offset
+     * PIN.</p>
      */
-    inline const VisaPinVerificationValue& GetVisaPinVerificationValue() const{ return m_visaPinVerificationValue; }
-    inline bool VisaPinVerificationValueHasBeenSet() const { return m_visaPinVerificationValueHasBeenSet; }
-    inline void SetVisaPinVerificationValue(const VisaPinVerificationValue& value) { m_visaPinVerificationValueHasBeenSet = true; m_visaPinVerificationValue = value; }
-    inline void SetVisaPinVerificationValue(VisaPinVerificationValue&& value) { m_visaPinVerificationValueHasBeenSet = true; m_visaPinVerificationValue = std::move(value); }
-    inline PinGenerationAttributes& WithVisaPinVerificationValue(const VisaPinVerificationValue& value) { SetVisaPinVerificationValue(value); return *this;}
-    inline PinGenerationAttributes& WithVisaPinVerificationValue(VisaPinVerificationValue&& value) { SetVisaPinVerificationValue(std::move(value)); return *this;}
+    inline const Ibm3624PinFromOffset& GetIbm3624PinFromOffset() const{ return m_ibm3624PinFromOffset; }
+    inline bool Ibm3624PinFromOffsetHasBeenSet() const { return m_ibm3624PinFromOffsetHasBeenSet; }
+    inline void SetIbm3624PinFromOffset(const Ibm3624PinFromOffset& value) { m_ibm3624PinFromOffsetHasBeenSet = true; m_ibm3624PinFromOffset = value; }
+    inline void SetIbm3624PinFromOffset(Ibm3624PinFromOffset&& value) { m_ibm3624PinFromOffsetHasBeenSet = true; m_ibm3624PinFromOffset = std::move(value); }
+    inline PinGenerationAttributes& WithIbm3624PinFromOffset(const Ibm3624PinFromOffset& value) { SetIbm3624PinFromOffset(value); return *this;}
+    inline PinGenerationAttributes& WithIbm3624PinFromOffset(Ibm3624PinFromOffset&& value) { SetIbm3624PinFromOffset(std::move(value)); return *this;}
     ///@}
   private:
 
-    Ibm3624NaturalPin m_ibm3624NaturalPin;
-    bool m_ibm3624NaturalPinHasBeenSet = false;
+    VisaPin m_visaPin;
+    bool m_visaPinHasBeenSet = false;
 
-    Ibm3624PinFromOffset m_ibm3624PinFromOffset;
-    bool m_ibm3624PinFromOffsetHasBeenSet = false;
+    VisaPinVerificationValue m_visaPinVerificationValue;
+    bool m_visaPinVerificationValueHasBeenSet = false;
 
     Ibm3624PinOffset m_ibm3624PinOffset;
     bool m_ibm3624PinOffsetHasBeenSet = false;
 
+    Ibm3624NaturalPin m_ibm3624NaturalPin;
+    bool m_ibm3624NaturalPinHasBeenSet = false;
+
     Ibm3624RandomPin m_ibm3624RandomPin;
     bool m_ibm3624RandomPinHasBeenSet = false;
 
-    VisaPin m_visaPin;
-    bool m_visaPinHasBeenSet = false;
-
-    VisaPinVerificationValue m_visaPinVerificationValue;
-    bool m_visaPinVerificationValueHasBeenSet = false;
+    Ibm3624PinFromOffset m_ibm3624PinFromOffset;
+    bool m_ibm3624PinFromOffsetHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinVerificationAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinVerificationAttributes.h
index beac8a7f9ba..bd9aafe2876 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinVerificationAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/PinVerificationAttributes.h
@@ -5,8 +5,8 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/payment-cryptography-data/model/Ibm3624PinVerification.h>
 #include <aws/payment-cryptography-data/model/VisaPinVerification.h>
+#include <aws/payment-cryptography-data/model/Ibm3624PinVerification.h>
 #include <utility>
 
 namespace Aws
@@ -39,18 +39,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>Parameters that are required to generate or verify Ibm3624 PIN.</p>
-     */
-    inline const Ibm3624PinVerification& GetIbm3624Pin() const{ return m_ibm3624Pin; }
-    inline bool Ibm3624PinHasBeenSet() const { return m_ibm3624PinHasBeenSet; }
-    inline void SetIbm3624Pin(const Ibm3624PinVerification& value) { m_ibm3624PinHasBeenSet = true; m_ibm3624Pin = value; }
-    inline void SetIbm3624Pin(Ibm3624PinVerification&& value) { m_ibm3624PinHasBeenSet = true; m_ibm3624Pin = std::move(value); }
-    inline PinVerificationAttributes& WithIbm3624Pin(const Ibm3624PinVerification& value) { SetIbm3624Pin(value); return *this;}
-    inline PinVerificationAttributes& WithIbm3624Pin(Ibm3624PinVerification&& value) { SetIbm3624Pin(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>Parameters that are required to generate or verify Visa PIN.</p>
@@ -62,13 +50,25 @@ namespace Model
     inline PinVerificationAttributes& WithVisaPin(const VisaPinVerification& value) { SetVisaPin(value); return *this;}
     inline PinVerificationAttributes& WithVisaPin(VisaPinVerification&& value) { SetVisaPin(std::move(value)); return *this;}
     ///@}
-  private:
 
-    Ibm3624PinVerification m_ibm3624Pin;
-    bool m_ibm3624PinHasBeenSet = false;
+    ///@{
+    /**
+     * <p>Parameters that are required to generate or verify Ibm3624 PIN.</p>
+     */
+    inline const Ibm3624PinVerification& GetIbm3624Pin() const{ return m_ibm3624Pin; }
+    inline bool Ibm3624PinHasBeenSet() const { return m_ibm3624PinHasBeenSet; }
+    inline void SetIbm3624Pin(const Ibm3624PinVerification& value) { m_ibm3624PinHasBeenSet = true; m_ibm3624Pin = value; }
+    inline void SetIbm3624Pin(Ibm3624PinVerification&& value) { m_ibm3624PinHasBeenSet = true; m_ibm3624Pin = std::move(value); }
+    inline PinVerificationAttributes& WithIbm3624Pin(const Ibm3624PinVerification& value) { SetIbm3624Pin(value); return *this;}
+    inline PinVerificationAttributes& WithIbm3624Pin(Ibm3624PinVerification&& value) { SetIbm3624Pin(std::move(value)); return *this;}
+    ///@}
+  private:
 
     VisaPinVerification m_visaPin;
     bool m_visaPinHasBeenSet = false;
+
+    Ibm3624PinVerification m_ibm3624Pin;
+    bool m_ibm3624PinHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataRequest.h
index 80788e165a8..cd6ff89c97f 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataRequest.h
@@ -8,6 +8,7 @@
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/ReEncryptionAttributes.h>
+#include <aws/payment-cryptography-data/model/WrappedKey.h>
 #include <utility>
 
 namespace Aws
@@ -33,6 +34,38 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the encryption key of incoming ciphertext
+     * data.</p> <p>When a WrappedKeyBlock is provided, this value will be the
+     * identifier to the key wrapping key. Otherwise, it is the key identifier used to
+     * perform the operation.</p>
+     */
+    inline const Aws::String& GetIncomingKeyIdentifier() const{ return m_incomingKeyIdentifier; }
+    inline bool IncomingKeyIdentifierHasBeenSet() const { return m_incomingKeyIdentifierHasBeenSet; }
+    inline void SetIncomingKeyIdentifier(const Aws::String& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = value; }
+    inline void SetIncomingKeyIdentifier(Aws::String&& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = std::move(value); }
+    inline void SetIncomingKeyIdentifier(const char* value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier.assign(value); }
+    inline ReEncryptDataRequest& WithIncomingKeyIdentifier(const Aws::String& value) { SetIncomingKeyIdentifier(value); return *this;}
+    inline ReEncryptDataRequest& WithIncomingKeyIdentifier(Aws::String&& value) { SetIncomingKeyIdentifier(std::move(value)); return *this;}
+    inline ReEncryptDataRequest& WithIncomingKeyIdentifier(const char* value) { SetIncomingKeyIdentifier(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the encryption key of outgoing ciphertext data
+     * after encryption by Amazon Web Services Payment Cryptography.</p>
+     */
+    inline const Aws::String& GetOutgoingKeyIdentifier() const{ return m_outgoingKeyIdentifier; }
+    inline bool OutgoingKeyIdentifierHasBeenSet() const { return m_outgoingKeyIdentifierHasBeenSet; }
+    inline void SetOutgoingKeyIdentifier(const Aws::String& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = value; }
+    inline void SetOutgoingKeyIdentifier(Aws::String&& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = std::move(value); }
+    inline void SetOutgoingKeyIdentifier(const char* value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier.assign(value); }
+    inline ReEncryptDataRequest& WithOutgoingKeyIdentifier(const Aws::String& value) { SetOutgoingKeyIdentifier(value); return *this;}
+    inline ReEncryptDataRequest& WithOutgoingKeyIdentifier(Aws::String&& value) { SetOutgoingKeyIdentifier(std::move(value)); return *this;}
+    inline ReEncryptDataRequest& WithOutgoingKeyIdentifier(const char* value) { SetOutgoingKeyIdentifier(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>Ciphertext to be encrypted. The minimum allowed length is 16 bytes and
@@ -60,21 +93,6 @@ namespace Model
     inline ReEncryptDataRequest& WithIncomingEncryptionAttributes(ReEncryptionAttributes&& value) { SetIncomingEncryptionAttributes(std::move(value)); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The <code>keyARN</code> of the encryption key of incoming ciphertext
-     * data.</p>
-     */
-    inline const Aws::String& GetIncomingKeyIdentifier() const{ return m_incomingKeyIdentifier; }
-    inline bool IncomingKeyIdentifierHasBeenSet() const { return m_incomingKeyIdentifierHasBeenSet; }
-    inline void SetIncomingKeyIdentifier(const Aws::String& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = value; }
-    inline void SetIncomingKeyIdentifier(Aws::String&& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = std::move(value); }
-    inline void SetIncomingKeyIdentifier(const char* value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier.assign(value); }
-    inline ReEncryptDataRequest& WithIncomingKeyIdentifier(const Aws::String& value) { SetIncomingKeyIdentifier(value); return *this;}
-    inline ReEncryptDataRequest& WithIncomingKeyIdentifier(Aws::String&& value) { SetIncomingKeyIdentifier(std::move(value)); return *this;}
-    inline ReEncryptDataRequest& WithIncomingKeyIdentifier(const char* value) { SetIncomingKeyIdentifier(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The attributes and values for outgoing ciphertext data after encryption by
@@ -90,34 +108,51 @@ namespace Model
 
     ///@{
     /**
-     * <p>The <code>keyARN</code> of the encryption key of outgoing ciphertext data
+     * <p>The WrappedKeyBlock containing the encryption key of incoming ciphertext
+     * data.</p>
+     */
+    inline const WrappedKey& GetIncomingWrappedKey() const{ return m_incomingWrappedKey; }
+    inline bool IncomingWrappedKeyHasBeenSet() const { return m_incomingWrappedKeyHasBeenSet; }
+    inline void SetIncomingWrappedKey(const WrappedKey& value) { m_incomingWrappedKeyHasBeenSet = true; m_incomingWrappedKey = value; }
+    inline void SetIncomingWrappedKey(WrappedKey&& value) { m_incomingWrappedKeyHasBeenSet = true; m_incomingWrappedKey = std::move(value); }
+    inline ReEncryptDataRequest& WithIncomingWrappedKey(const WrappedKey& value) { SetIncomingWrappedKey(value); return *this;}
+    inline ReEncryptDataRequest& WithIncomingWrappedKey(WrappedKey&& value) { SetIncomingWrappedKey(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The WrappedKeyBlock containing the encryption key of outgoing ciphertext data
      * after encryption by Amazon Web Services Payment Cryptography.</p>
      */
-    inline const Aws::String& GetOutgoingKeyIdentifier() const{ return m_outgoingKeyIdentifier; }
-    inline bool OutgoingKeyIdentifierHasBeenSet() const { return m_outgoingKeyIdentifierHasBeenSet; }
-    inline void SetOutgoingKeyIdentifier(const Aws::String& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = value; }
-    inline void SetOutgoingKeyIdentifier(Aws::String&& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = std::move(value); }
-    inline void SetOutgoingKeyIdentifier(const char* value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier.assign(value); }
-    inline ReEncryptDataRequest& WithOutgoingKeyIdentifier(const Aws::String& value) { SetOutgoingKeyIdentifier(value); return *this;}
-    inline ReEncryptDataRequest& WithOutgoingKeyIdentifier(Aws::String&& value) { SetOutgoingKeyIdentifier(std::move(value)); return *this;}
-    inline ReEncryptDataRequest& WithOutgoingKeyIdentifier(const char* value) { SetOutgoingKeyIdentifier(value); return *this;}
+    inline const WrappedKey& GetOutgoingWrappedKey() const{ return m_outgoingWrappedKey; }
+    inline bool OutgoingWrappedKeyHasBeenSet() const { return m_outgoingWrappedKeyHasBeenSet; }
+    inline void SetOutgoingWrappedKey(const WrappedKey& value) { m_outgoingWrappedKeyHasBeenSet = true; m_outgoingWrappedKey = value; }
+    inline void SetOutgoingWrappedKey(WrappedKey&& value) { m_outgoingWrappedKeyHasBeenSet = true; m_outgoingWrappedKey = std::move(value); }
+    inline ReEncryptDataRequest& WithOutgoingWrappedKey(const WrappedKey& value) { SetOutgoingWrappedKey(value); return *this;}
+    inline ReEncryptDataRequest& WithOutgoingWrappedKey(WrappedKey&& value) { SetOutgoingWrappedKey(std::move(value)); return *this;}
     ///@}
   private:
 
+    Aws::String m_incomingKeyIdentifier;
+    bool m_incomingKeyIdentifierHasBeenSet = false;
+
+    Aws::String m_outgoingKeyIdentifier;
+    bool m_outgoingKeyIdentifierHasBeenSet = false;
+
     Aws::String m_cipherText;
     bool m_cipherTextHasBeenSet = false;
 
     ReEncryptionAttributes m_incomingEncryptionAttributes;
     bool m_incomingEncryptionAttributesHasBeenSet = false;
 
-    Aws::String m_incomingKeyIdentifier;
-    bool m_incomingKeyIdentifierHasBeenSet = false;
-
     ReEncryptionAttributes m_outgoingEncryptionAttributes;
     bool m_outgoingEncryptionAttributesHasBeenSet = false;
 
-    Aws::String m_outgoingKeyIdentifier;
-    bool m_outgoingKeyIdentifierHasBeenSet = false;
+    WrappedKey m_incomingWrappedKey;
+    bool m_incomingWrappedKeyHasBeenSet = false;
+
+    WrappedKey m_outgoingWrappedKey;
+    bool m_outgoingWrappedKeyHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataResult.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataResult.h
index 2de2cedc596..85ac6ffd14f 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataResult.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptDataResult.h
@@ -32,19 +32,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API ReEncryptDataResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
 
 
-    ///@{
-    /**
-     * <p>The encrypted ciphertext.</p>
-     */
-    inline const Aws::String& GetCipherText() const{ return m_cipherText; }
-    inline void SetCipherText(const Aws::String& value) { m_cipherText = value; }
-    inline void SetCipherText(Aws::String&& value) { m_cipherText = std::move(value); }
-    inline void SetCipherText(const char* value) { m_cipherText.assign(value); }
-    inline ReEncryptDataResult& WithCipherText(const Aws::String& value) { SetCipherText(value); return *this;}
-    inline ReEncryptDataResult& WithCipherText(Aws::String&& value) { SetCipherText(std::move(value)); return *this;}
-    inline ReEncryptDataResult& WithCipherText(const char* value) { SetCipherText(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The keyARN (Amazon Resource Name) of the encryption key that Amazon Web
@@ -75,6 +62,19 @@ namespace Model
     inline ReEncryptDataResult& WithKeyCheckValue(const char* value) { SetKeyCheckValue(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The encrypted ciphertext.</p>
+     */
+    inline const Aws::String& GetCipherText() const{ return m_cipherText; }
+    inline void SetCipherText(const Aws::String& value) { m_cipherText = value; }
+    inline void SetCipherText(Aws::String&& value) { m_cipherText = std::move(value); }
+    inline void SetCipherText(const char* value) { m_cipherText.assign(value); }
+    inline ReEncryptDataResult& WithCipherText(const Aws::String& value) { SetCipherText(value); return *this;}
+    inline ReEncryptDataResult& WithCipherText(Aws::String&& value) { SetCipherText(std::move(value)); return *this;}
+    inline ReEncryptDataResult& WithCipherText(const char* value) { SetCipherText(value); return *this;}
+    ///@}
+
     ///@{
     
     inline const Aws::String& GetRequestId() const{ return m_requestId; }
@@ -87,12 +87,12 @@ namespace Model
     ///@}
   private:
 
-    Aws::String m_cipherText;
-
     Aws::String m_keyArn;
 
     Aws::String m_keyCheckValue;
 
+    Aws::String m_cipherText;
+
     Aws::String m_requestId;
   };
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptionAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptionAttributes.h
index a0878d33efc..c524d54c647 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptionAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ReEncryptionAttributes.h
@@ -5,8 +5,8 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/payment-cryptography-data/model/DukptEncryptionAttributes.h>
 #include <aws/payment-cryptography-data/model/SymmetricEncryptionAttributes.h>
+#include <aws/payment-cryptography-data/model/DukptEncryptionAttributes.h>
 #include <utility>
 
 namespace Aws
@@ -39,16 +39,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    
-    inline const DukptEncryptionAttributes& GetDukpt() const{ return m_dukpt; }
-    inline bool DukptHasBeenSet() const { return m_dukptHasBeenSet; }
-    inline void SetDukpt(const DukptEncryptionAttributes& value) { m_dukptHasBeenSet = true; m_dukpt = value; }
-    inline void SetDukpt(DukptEncryptionAttributes&& value) { m_dukptHasBeenSet = true; m_dukpt = std::move(value); }
-    inline ReEncryptionAttributes& WithDukpt(const DukptEncryptionAttributes& value) { SetDukpt(value); return *this;}
-    inline ReEncryptionAttributes& WithDukpt(DukptEncryptionAttributes&& value) { SetDukpt(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>Parameters that are required to encrypt data using symmetric keys.</p>
@@ -60,13 +50,23 @@ namespace Model
     inline ReEncryptionAttributes& WithSymmetric(const SymmetricEncryptionAttributes& value) { SetSymmetric(value); return *this;}
     inline ReEncryptionAttributes& WithSymmetric(SymmetricEncryptionAttributes&& value) { SetSymmetric(std::move(value)); return *this;}
     ///@}
-  private:
 
-    DukptEncryptionAttributes m_dukpt;
-    bool m_dukptHasBeenSet = false;
+    ///@{
+    
+    inline const DukptEncryptionAttributes& GetDukpt() const{ return m_dukpt; }
+    inline bool DukptHasBeenSet() const { return m_dukptHasBeenSet; }
+    inline void SetDukpt(const DukptEncryptionAttributes& value) { m_dukptHasBeenSet = true; m_dukpt = value; }
+    inline void SetDukpt(DukptEncryptionAttributes&& value) { m_dukptHasBeenSet = true; m_dukpt = std::move(value); }
+    inline ReEncryptionAttributes& WithDukpt(const DukptEncryptionAttributes& value) { SetDukpt(value); return *this;}
+    inline ReEncryptionAttributes& WithDukpt(DukptEncryptionAttributes&& value) { SetDukpt(std::move(value)); return *this;}
+    ///@}
+  private:
 
     SymmetricEncryptionAttributes m_symmetric;
     bool m_symmetricHasBeenSet = false;
+
+    DukptEncryptionAttributes m_dukpt;
+    bool m_dukptHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyAmex.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyAmex.h
index fd829ef8c8d..4db2e7bf281 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyAmex.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyAmex.h
@@ -38,21 +38,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>A number that identifies and differentiates payment cards with the same
-     * Primary Account Number (PAN).</p>
-     */
-    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
-    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
-    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
-    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
-    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
-    inline SessionKeyAmex& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
-    inline SessionKeyAmex& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
-    inline SessionKeyAmex& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
@@ -68,13 +53,28 @@ namespace Model
     inline SessionKeyAmex& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
     inline SessionKeyAmex& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
-  private:
 
-    Aws::String m_panSequenceNumber;
-    bool m_panSequenceNumberHasBeenSet = false;
+    ///@{
+    /**
+     * <p>A number that identifies and differentiates payment cards with the same
+     * Primary Account Number (PAN).</p>
+     */
+    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
+    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
+    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
+    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
+    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
+    inline SessionKeyAmex& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
+    inline SessionKeyAmex& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
+    inline SessionKeyAmex& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
+    ///@}
+  private:
 
     Aws::String m_primaryAccountNumber;
     bool m_primaryAccountNumberHasBeenSet = false;
+
+    Aws::String m_panSequenceNumber;
+    bool m_panSequenceNumberHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyDerivation.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyDerivation.h
index bf1f5908998..9dd71ce44ba 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyDerivation.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyDerivation.h
@@ -5,10 +5,10 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/payment-cryptography-data/model/SessionKeyAmex.h>
-#include <aws/payment-cryptography-data/model/SessionKeyEmv2000.h>
 #include <aws/payment-cryptography-data/model/SessionKeyEmvCommon.h>
 #include <aws/payment-cryptography-data/model/SessionKeyMastercard.h>
+#include <aws/payment-cryptography-data/model/SessionKeyEmv2000.h>
+#include <aws/payment-cryptography-data/model/SessionKeyAmex.h>
 #include <aws/payment-cryptography-data/model/SessionKeyVisa.h>
 #include <utility>
 
@@ -42,32 +42,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>Parameters to derive session key for an Amex payment card for ARQC
-     * verification.</p>
-     */
-    inline const SessionKeyAmex& GetAmex() const{ return m_amex; }
-    inline bool AmexHasBeenSet() const { return m_amexHasBeenSet; }
-    inline void SetAmex(const SessionKeyAmex& value) { m_amexHasBeenSet = true; m_amex = value; }
-    inline void SetAmex(SessionKeyAmex&& value) { m_amexHasBeenSet = true; m_amex = std::move(value); }
-    inline SessionKeyDerivation& WithAmex(const SessionKeyAmex& value) { SetAmex(value); return *this;}
-    inline SessionKeyDerivation& WithAmex(SessionKeyAmex&& value) { SetAmex(std::move(value)); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>Parameters to derive session key for an Emv2000 payment card for ARQC
-     * verification.</p>
-     */
-    inline const SessionKeyEmv2000& GetEmv2000() const{ return m_emv2000; }
-    inline bool Emv2000HasBeenSet() const { return m_emv2000HasBeenSet; }
-    inline void SetEmv2000(const SessionKeyEmv2000& value) { m_emv2000HasBeenSet = true; m_emv2000 = value; }
-    inline void SetEmv2000(SessionKeyEmv2000&& value) { m_emv2000HasBeenSet = true; m_emv2000 = std::move(value); }
-    inline SessionKeyDerivation& WithEmv2000(const SessionKeyEmv2000& value) { SetEmv2000(value); return *this;}
-    inline SessionKeyDerivation& WithEmv2000(SessionKeyEmv2000&& value) { SetEmv2000(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>Parameters to derive session key for an Emv common payment card for ARQC
@@ -94,6 +68,32 @@ namespace Model
     inline SessionKeyDerivation& WithMastercard(SessionKeyMastercard&& value) { SetMastercard(std::move(value)); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>Parameters to derive session key for an Emv2000 payment card for ARQC
+     * verification.</p>
+     */
+    inline const SessionKeyEmv2000& GetEmv2000() const{ return m_emv2000; }
+    inline bool Emv2000HasBeenSet() const { return m_emv2000HasBeenSet; }
+    inline void SetEmv2000(const SessionKeyEmv2000& value) { m_emv2000HasBeenSet = true; m_emv2000 = value; }
+    inline void SetEmv2000(SessionKeyEmv2000&& value) { m_emv2000HasBeenSet = true; m_emv2000 = std::move(value); }
+    inline SessionKeyDerivation& WithEmv2000(const SessionKeyEmv2000& value) { SetEmv2000(value); return *this;}
+    inline SessionKeyDerivation& WithEmv2000(SessionKeyEmv2000&& value) { SetEmv2000(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>Parameters to derive session key for an Amex payment card for ARQC
+     * verification.</p>
+     */
+    inline const SessionKeyAmex& GetAmex() const{ return m_amex; }
+    inline bool AmexHasBeenSet() const { return m_amexHasBeenSet; }
+    inline void SetAmex(const SessionKeyAmex& value) { m_amexHasBeenSet = true; m_amex = value; }
+    inline void SetAmex(SessionKeyAmex&& value) { m_amexHasBeenSet = true; m_amex = std::move(value); }
+    inline SessionKeyDerivation& WithAmex(const SessionKeyAmex& value) { SetAmex(value); return *this;}
+    inline SessionKeyDerivation& WithAmex(SessionKeyAmex&& value) { SetAmex(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>Parameters to derive session key for a Visa payment cardfor ARQC
@@ -108,18 +108,18 @@ namespace Model
     ///@}
   private:
 
-    SessionKeyAmex m_amex;
-    bool m_amexHasBeenSet = false;
-
-    SessionKeyEmv2000 m_emv2000;
-    bool m_emv2000HasBeenSet = false;
-
     SessionKeyEmvCommon m_emvCommon;
     bool m_emvCommonHasBeenSet = false;
 
     SessionKeyMastercard m_mastercard;
     bool m_mastercardHasBeenSet = false;
 
+    SessionKeyEmv2000 m_emv2000;
+    bool m_emv2000HasBeenSet = false;
+
+    SessionKeyAmex m_amex;
+    bool m_amexHasBeenSet = false;
+
     SessionKeyVisa m_visa;
     bool m_visaHasBeenSet = false;
   };
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmv2000.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmv2000.h
index 95f842ecd79..0edeeec4591 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmv2000.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmv2000.h
@@ -40,17 +40,18 @@ namespace Model
 
     ///@{
     /**
-     * <p>The transaction counter that is provided by the terminal during transaction
-     * processing.</p>
+     * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
+     * identifier for a payment credit or debit card and associates the card to a
+     * specific account holder.</p>
      */
-    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
-    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
-    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
-    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
-    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
-    inline SessionKeyEmv2000& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
-    inline SessionKeyEmv2000& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
-    inline SessionKeyEmv2000& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
+    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
+    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
+    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
+    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
+    inline SessionKeyEmv2000& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
+    inline SessionKeyEmv2000& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
+    inline SessionKeyEmv2000& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -70,29 +71,28 @@ namespace Model
 
     ///@{
     /**
-     * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
-     * identifier for a payment credit or debit card and associates the card to a
-     * specific account holder.</p>
+     * <p>The transaction counter that is provided by the terminal during transaction
+     * processing.</p>
      */
-    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
-    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
-    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
-    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
-    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
-    inline SessionKeyEmv2000& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
-    inline SessionKeyEmv2000& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
-    inline SessionKeyEmv2000& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
+    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
+    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
+    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
+    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
+    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
+    inline SessionKeyEmv2000& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
+    inline SessionKeyEmv2000& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
+    inline SessionKeyEmv2000& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
     ///@}
   private:
 
-    Aws::String m_applicationTransactionCounter;
-    bool m_applicationTransactionCounterHasBeenSet = false;
+    Aws::String m_primaryAccountNumber;
+    bool m_primaryAccountNumberHasBeenSet = false;
 
     Aws::String m_panSequenceNumber;
     bool m_panSequenceNumberHasBeenSet = false;
 
-    Aws::String m_primaryAccountNumber;
-    bool m_primaryAccountNumberHasBeenSet = false;
+    Aws::String m_applicationTransactionCounter;
+    bool m_applicationTransactionCounterHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmvCommon.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmvCommon.h
index 214f3a01747..afb21050d0a 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmvCommon.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyEmvCommon.h
@@ -40,17 +40,18 @@ namespace Model
 
     ///@{
     /**
-     * <p>The transaction counter that is provided by the terminal during transaction
-     * processing.</p>
+     * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
+     * identifier for a payment credit or debit card and associates the card to a
+     * specific account holder.</p>
      */
-    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
-    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
-    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
-    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
-    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
-    inline SessionKeyEmvCommon& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
-    inline SessionKeyEmvCommon& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
-    inline SessionKeyEmvCommon& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
+    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
+    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
+    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
+    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
+    inline SessionKeyEmvCommon& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
+    inline SessionKeyEmvCommon& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
+    inline SessionKeyEmvCommon& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -70,29 +71,28 @@ namespace Model
 
     ///@{
     /**
-     * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
-     * identifier for a payment credit or debit card and associates the card to a
-     * specific account holder.</p>
+     * <p>The transaction counter that is provided by the terminal during transaction
+     * processing.</p>
      */
-    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
-    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
-    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
-    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
-    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
-    inline SessionKeyEmvCommon& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
-    inline SessionKeyEmvCommon& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
-    inline SessionKeyEmvCommon& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
+    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
+    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
+    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
+    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
+    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
+    inline SessionKeyEmvCommon& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
+    inline SessionKeyEmvCommon& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
+    inline SessionKeyEmvCommon& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
     ///@}
   private:
 
-    Aws::String m_applicationTransactionCounter;
-    bool m_applicationTransactionCounterHasBeenSet = false;
+    Aws::String m_primaryAccountNumber;
+    bool m_primaryAccountNumberHasBeenSet = false;
 
     Aws::String m_panSequenceNumber;
     bool m_panSequenceNumberHasBeenSet = false;
 
-    Aws::String m_primaryAccountNumber;
-    bool m_primaryAccountNumberHasBeenSet = false;
+    Aws::String m_applicationTransactionCounter;
+    bool m_applicationTransactionCounterHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyMastercard.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyMastercard.h
index 22423bfae09..7df7bcb522a 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyMastercard.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyMastercard.h
@@ -40,17 +40,18 @@ namespace Model
 
     ///@{
     /**
-     * <p>The transaction counter that is provided by the terminal during transaction
-     * processing.</p>
+     * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
+     * identifier for a payment credit or debit card and associates the card to a
+     * specific account holder.</p>
      */
-    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
-    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
-    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
-    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
-    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
-    inline SessionKeyMastercard& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
-    inline SessionKeyMastercard& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
-    inline SessionKeyMastercard& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
+    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
+    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
+    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
+    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
+    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
+    inline SessionKeyMastercard& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
+    inline SessionKeyMastercard& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
+    inline SessionKeyMastercard& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -70,18 +71,17 @@ namespace Model
 
     ///@{
     /**
-     * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
-     * identifier for a payment credit or debit card and associates the card to a
-     * specific account holder.</p>
+     * <p>The transaction counter that is provided by the terminal during transaction
+     * processing.</p>
      */
-    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
-    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
-    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
-    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
-    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
-    inline SessionKeyMastercard& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
-    inline SessionKeyMastercard& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
-    inline SessionKeyMastercard& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
+    inline const Aws::String& GetApplicationTransactionCounter() const{ return m_applicationTransactionCounter; }
+    inline bool ApplicationTransactionCounterHasBeenSet() const { return m_applicationTransactionCounterHasBeenSet; }
+    inline void SetApplicationTransactionCounter(const Aws::String& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = value; }
+    inline void SetApplicationTransactionCounter(Aws::String&& value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter = std::move(value); }
+    inline void SetApplicationTransactionCounter(const char* value) { m_applicationTransactionCounterHasBeenSet = true; m_applicationTransactionCounter.assign(value); }
+    inline SessionKeyMastercard& WithApplicationTransactionCounter(const Aws::String& value) { SetApplicationTransactionCounter(value); return *this;}
+    inline SessionKeyMastercard& WithApplicationTransactionCounter(Aws::String&& value) { SetApplicationTransactionCounter(std::move(value)); return *this;}
+    inline SessionKeyMastercard& WithApplicationTransactionCounter(const char* value) { SetApplicationTransactionCounter(value); return *this;}
     ///@}
 
     ///@{
@@ -99,14 +99,14 @@ namespace Model
     ///@}
   private:
 
-    Aws::String m_applicationTransactionCounter;
-    bool m_applicationTransactionCounterHasBeenSet = false;
+    Aws::String m_primaryAccountNumber;
+    bool m_primaryAccountNumberHasBeenSet = false;
 
     Aws::String m_panSequenceNumber;
     bool m_panSequenceNumberHasBeenSet = false;
 
-    Aws::String m_primaryAccountNumber;
-    bool m_primaryAccountNumberHasBeenSet = false;
+    Aws::String m_applicationTransactionCounter;
+    bool m_applicationTransactionCounterHasBeenSet = false;
 
     Aws::String m_unpredictableNumber;
     bool m_unpredictableNumberHasBeenSet = false;
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyVisa.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyVisa.h
index b5052c8fa3f..be13ab25582 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyVisa.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SessionKeyVisa.h
@@ -38,21 +38,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>A number that identifies and differentiates payment cards with the same
-     * Primary Account Number (PAN).</p>
-     */
-    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
-    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
-    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
-    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
-    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
-    inline SessionKeyVisa& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
-    inline SessionKeyVisa& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
-    inline SessionKeyVisa& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique
@@ -68,13 +53,28 @@ namespace Model
     inline SessionKeyVisa& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
     inline SessionKeyVisa& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
-  private:
 
-    Aws::String m_panSequenceNumber;
-    bool m_panSequenceNumberHasBeenSet = false;
+    ///@{
+    /**
+     * <p>A number that identifies and differentiates payment cards with the same
+     * Primary Account Number (PAN).</p>
+     */
+    inline const Aws::String& GetPanSequenceNumber() const{ return m_panSequenceNumber; }
+    inline bool PanSequenceNumberHasBeenSet() const { return m_panSequenceNumberHasBeenSet; }
+    inline void SetPanSequenceNumber(const Aws::String& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = value; }
+    inline void SetPanSequenceNumber(Aws::String&& value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber = std::move(value); }
+    inline void SetPanSequenceNumber(const char* value) { m_panSequenceNumberHasBeenSet = true; m_panSequenceNumber.assign(value); }
+    inline SessionKeyVisa& WithPanSequenceNumber(const Aws::String& value) { SetPanSequenceNumber(value); return *this;}
+    inline SessionKeyVisa& WithPanSequenceNumber(Aws::String&& value) { SetPanSequenceNumber(std::move(value)); return *this;}
+    inline SessionKeyVisa& WithPanSequenceNumber(const char* value) { SetPanSequenceNumber(value); return *this;}
+    ///@}
+  private:
 
     Aws::String m_primaryAccountNumber;
     bool m_primaryAccountNumberHasBeenSet = false;
+
+    Aws::String m_panSequenceNumber;
+    bool m_panSequenceNumberHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SymmetricEncryptionAttributes.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SymmetricEncryptionAttributes.h
index 9d20877f576..fb48f1c3e2f 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SymmetricEncryptionAttributes.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/SymmetricEncryptionAttributes.h
@@ -5,8 +5,8 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/EncryptionMode.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/PaddingType.h>
 #include <utility>
 
@@ -40,6 +40,18 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
+    ///@{
+    /**
+     * <p>The block cipher method to use for encryption.</p>
+     */
+    inline const EncryptionMode& GetMode() const{ return m_mode; }
+    inline bool ModeHasBeenSet() const { return m_modeHasBeenSet; }
+    inline void SetMode(const EncryptionMode& value) { m_modeHasBeenSet = true; m_mode = value; }
+    inline void SetMode(EncryptionMode&& value) { m_modeHasBeenSet = true; m_mode = std::move(value); }
+    inline SymmetricEncryptionAttributes& WithMode(const EncryptionMode& value) { SetMode(value); return *this;}
+    inline SymmetricEncryptionAttributes& WithMode(EncryptionMode&& value) { SetMode(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>An input used to provide the intial state. If no value is provided, Amazon
@@ -55,18 +67,6 @@ namespace Model
     inline SymmetricEncryptionAttributes& WithInitializationVector(const char* value) { SetInitializationVector(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The block cipher method to use for encryption.</p>
-     */
-    inline const EncryptionMode& GetMode() const{ return m_mode; }
-    inline bool ModeHasBeenSet() const { return m_modeHasBeenSet; }
-    inline void SetMode(const EncryptionMode& value) { m_modeHasBeenSet = true; m_mode = value; }
-    inline void SetMode(EncryptionMode&& value) { m_modeHasBeenSet = true; m_mode = std::move(value); }
-    inline SymmetricEncryptionAttributes& WithMode(const EncryptionMode& value) { SetMode(value); return *this;}
-    inline SymmetricEncryptionAttributes& WithMode(EncryptionMode&& value) { SetMode(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The padding to be included with the data.</p>
@@ -80,12 +80,12 @@ namespace Model
     ///@}
   private:
 
-    Aws::String m_initializationVector;
-    bool m_initializationVectorHasBeenSet = false;
-
     EncryptionMode m_mode;
     bool m_modeHasBeenSet = false;
 
+    Aws::String m_initializationVector;
+    bool m_initializationVectorHasBeenSet = false;
+
     PaddingType m_paddingType;
     bool m_paddingTypeHasBeenSet = false;
   };
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataRequest.h
index 9658f81fefb..d91b2b33ec7 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataRequest.h
@@ -7,8 +7,9 @@
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
-#include <aws/payment-cryptography-data/model/DukptDerivationAttributes.h>
 #include <aws/payment-cryptography-data/model/TranslationIsoFormats.h>
+#include <aws/payment-cryptography-data/model/DukptDerivationAttributes.h>
+#include <aws/payment-cryptography-data/model/WrappedKey.h>
 #include <utility>
 
 namespace Aws
@@ -34,6 +35,65 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the encryption key under which incoming PIN block
+     * data is encrypted. This key type can be PEK or BDK.</p> <p>When a
+     * WrappedKeyBlock is provided, this value will be the identifier to the key
+     * wrapping key for PIN block. Otherwise, it is the key identifier used to perform
+     * the operation.</p>
+     */
+    inline const Aws::String& GetIncomingKeyIdentifier() const{ return m_incomingKeyIdentifier; }
+    inline bool IncomingKeyIdentifierHasBeenSet() const { return m_incomingKeyIdentifierHasBeenSet; }
+    inline void SetIncomingKeyIdentifier(const Aws::String& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = value; }
+    inline void SetIncomingKeyIdentifier(Aws::String&& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = std::move(value); }
+    inline void SetIncomingKeyIdentifier(const char* value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier.assign(value); }
+    inline TranslatePinDataRequest& WithIncomingKeyIdentifier(const Aws::String& value) { SetIncomingKeyIdentifier(value); return *this;}
+    inline TranslatePinDataRequest& WithIncomingKeyIdentifier(Aws::String&& value) { SetIncomingKeyIdentifier(std::move(value)); return *this;}
+    inline TranslatePinDataRequest& WithIncomingKeyIdentifier(const char* value) { SetIncomingKeyIdentifier(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the encryption key for encrypting outgoing PIN
+     * block data. This key type can be PEK or BDK.</p>
+     */
+    inline const Aws::String& GetOutgoingKeyIdentifier() const{ return m_outgoingKeyIdentifier; }
+    inline bool OutgoingKeyIdentifierHasBeenSet() const { return m_outgoingKeyIdentifierHasBeenSet; }
+    inline void SetOutgoingKeyIdentifier(const Aws::String& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = value; }
+    inline void SetOutgoingKeyIdentifier(Aws::String&& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = std::move(value); }
+    inline void SetOutgoingKeyIdentifier(const char* value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier.assign(value); }
+    inline TranslatePinDataRequest& WithOutgoingKeyIdentifier(const Aws::String& value) { SetOutgoingKeyIdentifier(value); return *this;}
+    inline TranslatePinDataRequest& WithOutgoingKeyIdentifier(Aws::String&& value) { SetOutgoingKeyIdentifier(std::move(value)); return *this;}
+    inline TranslatePinDataRequest& WithOutgoingKeyIdentifier(const char* value) { SetOutgoingKeyIdentifier(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The format of the incoming PIN block data for translation within Amazon Web
+     * Services Payment Cryptography.</p>
+     */
+    inline const TranslationIsoFormats& GetIncomingTranslationAttributes() const{ return m_incomingTranslationAttributes; }
+    inline bool IncomingTranslationAttributesHasBeenSet() const { return m_incomingTranslationAttributesHasBeenSet; }
+    inline void SetIncomingTranslationAttributes(const TranslationIsoFormats& value) { m_incomingTranslationAttributesHasBeenSet = true; m_incomingTranslationAttributes = value; }
+    inline void SetIncomingTranslationAttributes(TranslationIsoFormats&& value) { m_incomingTranslationAttributesHasBeenSet = true; m_incomingTranslationAttributes = std::move(value); }
+    inline TranslatePinDataRequest& WithIncomingTranslationAttributes(const TranslationIsoFormats& value) { SetIncomingTranslationAttributes(value); return *this;}
+    inline TranslatePinDataRequest& WithIncomingTranslationAttributes(TranslationIsoFormats&& value) { SetIncomingTranslationAttributes(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The format of the outgoing PIN block data after translation by Amazon Web
+     * Services Payment Cryptography.</p>
+     */
+    inline const TranslationIsoFormats& GetOutgoingTranslationAttributes() const{ return m_outgoingTranslationAttributes; }
+    inline bool OutgoingTranslationAttributesHasBeenSet() const { return m_outgoingTranslationAttributesHasBeenSet; }
+    inline void SetOutgoingTranslationAttributes(const TranslationIsoFormats& value) { m_outgoingTranslationAttributesHasBeenSet = true; m_outgoingTranslationAttributes = value; }
+    inline void SetOutgoingTranslationAttributes(TranslationIsoFormats&& value) { m_outgoingTranslationAttributesHasBeenSet = true; m_outgoingTranslationAttributes = std::move(value); }
+    inline TranslatePinDataRequest& WithOutgoingTranslationAttributes(const TranslationIsoFormats& value) { SetOutgoingTranslationAttributes(value); return *this;}
+    inline TranslatePinDataRequest& WithOutgoingTranslationAttributes(TranslationIsoFormats&& value) { SetOutgoingTranslationAttributes(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The encrypted PIN block data that Amazon Web Services Payment Cryptography
@@ -62,34 +122,6 @@ namespace Model
     inline TranslatePinDataRequest& WithIncomingDukptAttributes(DukptDerivationAttributes&& value) { SetIncomingDukptAttributes(std::move(value)); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The <code>keyARN</code> of the encryption key under which incoming PIN block
-     * data is encrypted. This key type can be PEK or BDK.</p>
-     */
-    inline const Aws::String& GetIncomingKeyIdentifier() const{ return m_incomingKeyIdentifier; }
-    inline bool IncomingKeyIdentifierHasBeenSet() const { return m_incomingKeyIdentifierHasBeenSet; }
-    inline void SetIncomingKeyIdentifier(const Aws::String& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = value; }
-    inline void SetIncomingKeyIdentifier(Aws::String&& value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier = std::move(value); }
-    inline void SetIncomingKeyIdentifier(const char* value) { m_incomingKeyIdentifierHasBeenSet = true; m_incomingKeyIdentifier.assign(value); }
-    inline TranslatePinDataRequest& WithIncomingKeyIdentifier(const Aws::String& value) { SetIncomingKeyIdentifier(value); return *this;}
-    inline TranslatePinDataRequest& WithIncomingKeyIdentifier(Aws::String&& value) { SetIncomingKeyIdentifier(std::move(value)); return *this;}
-    inline TranslatePinDataRequest& WithIncomingKeyIdentifier(const char* value) { SetIncomingKeyIdentifier(value); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>The format of the incoming PIN block data for translation within Amazon Web
-     * Services Payment Cryptography.</p>
-     */
-    inline const TranslationIsoFormats& GetIncomingTranslationAttributes() const{ return m_incomingTranslationAttributes; }
-    inline bool IncomingTranslationAttributesHasBeenSet() const { return m_incomingTranslationAttributesHasBeenSet; }
-    inline void SetIncomingTranslationAttributes(const TranslationIsoFormats& value) { m_incomingTranslationAttributesHasBeenSet = true; m_incomingTranslationAttributes = value; }
-    inline void SetIncomingTranslationAttributes(TranslationIsoFormats&& value) { m_incomingTranslationAttributesHasBeenSet = true; m_incomingTranslationAttributes = std::move(value); }
-    inline TranslatePinDataRequest& WithIncomingTranslationAttributes(const TranslationIsoFormats& value) { SetIncomingTranslationAttributes(value); return *this;}
-    inline TranslatePinDataRequest& WithIncomingTranslationAttributes(TranslationIsoFormats&& value) { SetIncomingTranslationAttributes(std::move(value)); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The attributes and values to use for outgoing DUKPT encryption key after PIN
@@ -105,53 +137,57 @@ namespace Model
 
     ///@{
     /**
-     * <p>The <code>keyARN</code> of the encryption key for encrypting outgoing PIN
-     * block data. This key type can be PEK or BDK.</p>
+     * <p>The WrappedKeyBlock containing the encryption key under which incoming PIN
+     * block data is encrypted.</p>
      */
-    inline const Aws::String& GetOutgoingKeyIdentifier() const{ return m_outgoingKeyIdentifier; }
-    inline bool OutgoingKeyIdentifierHasBeenSet() const { return m_outgoingKeyIdentifierHasBeenSet; }
-    inline void SetOutgoingKeyIdentifier(const Aws::String& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = value; }
-    inline void SetOutgoingKeyIdentifier(Aws::String&& value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier = std::move(value); }
-    inline void SetOutgoingKeyIdentifier(const char* value) { m_outgoingKeyIdentifierHasBeenSet = true; m_outgoingKeyIdentifier.assign(value); }
-    inline TranslatePinDataRequest& WithOutgoingKeyIdentifier(const Aws::String& value) { SetOutgoingKeyIdentifier(value); return *this;}
-    inline TranslatePinDataRequest& WithOutgoingKeyIdentifier(Aws::String&& value) { SetOutgoingKeyIdentifier(std::move(value)); return *this;}
-    inline TranslatePinDataRequest& WithOutgoingKeyIdentifier(const char* value) { SetOutgoingKeyIdentifier(value); return *this;}
+    inline const WrappedKey& GetIncomingWrappedKey() const{ return m_incomingWrappedKey; }
+    inline bool IncomingWrappedKeyHasBeenSet() const { return m_incomingWrappedKeyHasBeenSet; }
+    inline void SetIncomingWrappedKey(const WrappedKey& value) { m_incomingWrappedKeyHasBeenSet = true; m_incomingWrappedKey = value; }
+    inline void SetIncomingWrappedKey(WrappedKey&& value) { m_incomingWrappedKeyHasBeenSet = true; m_incomingWrappedKey = std::move(value); }
+    inline TranslatePinDataRequest& WithIncomingWrappedKey(const WrappedKey& value) { SetIncomingWrappedKey(value); return *this;}
+    inline TranslatePinDataRequest& WithIncomingWrappedKey(WrappedKey&& value) { SetIncomingWrappedKey(std::move(value)); return *this;}
     ///@}
 
     ///@{
     /**
-     * <p>The format of the outgoing PIN block data after translation by Amazon Web
-     * Services Payment Cryptography.</p>
+     * <p>The WrappedKeyBlock containing the encryption key for encrypting outgoing PIN
+     * block data.</p>
      */
-    inline const TranslationIsoFormats& GetOutgoingTranslationAttributes() const{ return m_outgoingTranslationAttributes; }
-    inline bool OutgoingTranslationAttributesHasBeenSet() const { return m_outgoingTranslationAttributesHasBeenSet; }
-    inline void SetOutgoingTranslationAttributes(const TranslationIsoFormats& value) { m_outgoingTranslationAttributesHasBeenSet = true; m_outgoingTranslationAttributes = value; }
-    inline void SetOutgoingTranslationAttributes(TranslationIsoFormats&& value) { m_outgoingTranslationAttributesHasBeenSet = true; m_outgoingTranslationAttributes = std::move(value); }
-    inline TranslatePinDataRequest& WithOutgoingTranslationAttributes(const TranslationIsoFormats& value) { SetOutgoingTranslationAttributes(value); return *this;}
-    inline TranslatePinDataRequest& WithOutgoingTranslationAttributes(TranslationIsoFormats&& value) { SetOutgoingTranslationAttributes(std::move(value)); return *this;}
+    inline const WrappedKey& GetOutgoingWrappedKey() const{ return m_outgoingWrappedKey; }
+    inline bool OutgoingWrappedKeyHasBeenSet() const { return m_outgoingWrappedKeyHasBeenSet; }
+    inline void SetOutgoingWrappedKey(const WrappedKey& value) { m_outgoingWrappedKeyHasBeenSet = true; m_outgoingWrappedKey = value; }
+    inline void SetOutgoingWrappedKey(WrappedKey&& value) { m_outgoingWrappedKeyHasBeenSet = true; m_outgoingWrappedKey = std::move(value); }
+    inline TranslatePinDataRequest& WithOutgoingWrappedKey(const WrappedKey& value) { SetOutgoingWrappedKey(value); return *this;}
+    inline TranslatePinDataRequest& WithOutgoingWrappedKey(WrappedKey&& value) { SetOutgoingWrappedKey(std::move(value)); return *this;}
     ///@}
   private:
 
-    Aws::String m_encryptedPinBlock;
-    bool m_encryptedPinBlockHasBeenSet = false;
-
-    DukptDerivationAttributes m_incomingDukptAttributes;
-    bool m_incomingDukptAttributesHasBeenSet = false;
-
     Aws::String m_incomingKeyIdentifier;
     bool m_incomingKeyIdentifierHasBeenSet = false;
 
+    Aws::String m_outgoingKeyIdentifier;
+    bool m_outgoingKeyIdentifierHasBeenSet = false;
+
     TranslationIsoFormats m_incomingTranslationAttributes;
     bool m_incomingTranslationAttributesHasBeenSet = false;
 
+    TranslationIsoFormats m_outgoingTranslationAttributes;
+    bool m_outgoingTranslationAttributesHasBeenSet = false;
+
+    Aws::String m_encryptedPinBlock;
+    bool m_encryptedPinBlockHasBeenSet = false;
+
+    DukptDerivationAttributes m_incomingDukptAttributes;
+    bool m_incomingDukptAttributesHasBeenSet = false;
+
     DukptDerivationAttributes m_outgoingDukptAttributes;
     bool m_outgoingDukptAttributesHasBeenSet = false;
 
-    Aws::String m_outgoingKeyIdentifier;
-    bool m_outgoingKeyIdentifierHasBeenSet = false;
+    WrappedKey m_incomingWrappedKey;
+    bool m_incomingWrappedKeyHasBeenSet = false;
 
-    TranslationIsoFormats m_outgoingTranslationAttributes;
-    bool m_outgoingTranslationAttributesHasBeenSet = false;
+    WrappedKey m_outgoingWrappedKey;
+    bool m_outgoingWrappedKeyHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataResult.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataResult.h
index 0f1fa66d4fb..5a0b75e53e3 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataResult.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/TranslatePinDataResult.h
@@ -32,6 +32,19 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API TranslatePinDataResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
 
 
+    ///@{
+    /**
+     * <p>The outgoing encrypted PIN block data after translation.</p>
+     */
+    inline const Aws::String& GetPinBlock() const{ return m_pinBlock; }
+    inline void SetPinBlock(const Aws::String& value) { m_pinBlock = value; }
+    inline void SetPinBlock(Aws::String&& value) { m_pinBlock = std::move(value); }
+    inline void SetPinBlock(const char* value) { m_pinBlock.assign(value); }
+    inline TranslatePinDataResult& WithPinBlock(const Aws::String& value) { SetPinBlock(value); return *this;}
+    inline TranslatePinDataResult& WithPinBlock(Aws::String&& value) { SetPinBlock(std::move(value)); return *this;}
+    inline TranslatePinDataResult& WithPinBlock(const char* value) { SetPinBlock(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The <code>keyARN</code> of the encryption key that Amazon Web Services
@@ -63,19 +76,6 @@ namespace Model
     inline TranslatePinDataResult& WithKeyCheckValue(const char* value) { SetKeyCheckValue(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The outgoing encrypted PIN block data after translation.</p>
-     */
-    inline const Aws::String& GetPinBlock() const{ return m_pinBlock; }
-    inline void SetPinBlock(const Aws::String& value) { m_pinBlock = value; }
-    inline void SetPinBlock(Aws::String&& value) { m_pinBlock = std::move(value); }
-    inline void SetPinBlock(const char* value) { m_pinBlock.assign(value); }
-    inline TranslatePinDataResult& WithPinBlock(const Aws::String& value) { SetPinBlock(value); return *this;}
-    inline TranslatePinDataResult& WithPinBlock(Aws::String&& value) { SetPinBlock(std::move(value)); return *this;}
-    inline TranslatePinDataResult& WithPinBlock(const char* value) { SetPinBlock(value); return *this;}
-    ///@}
-
     ///@{
     
     inline const Aws::String& GetRequestId() const{ return m_requestId; }
@@ -88,12 +88,12 @@ namespace Model
     ///@}
   private:
 
+    Aws::String m_pinBlock;
+
     Aws::String m_keyArn;
 
     Aws::String m_keyCheckValue;
 
-    Aws::String m_pinBlock;
-
     Aws::String m_requestId;
   };
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationException.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationException.h
index 1fa5ddef7c6..404a1640c30 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationException.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationException.h
@@ -5,8 +5,8 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/core/utils/memory/stl/AWSVector.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
 #include <aws/payment-cryptography-data/model/ValidationExceptionField.h>
 #include <utility>
 
@@ -40,6 +40,18 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
+    ///@{
+    
+    inline const Aws::String& GetMessage() const{ return m_message; }
+    inline bool MessageHasBeenSet() const { return m_messageHasBeenSet; }
+    inline void SetMessage(const Aws::String& value) { m_messageHasBeenSet = true; m_message = value; }
+    inline void SetMessage(Aws::String&& value) { m_messageHasBeenSet = true; m_message = std::move(value); }
+    inline void SetMessage(const char* value) { m_messageHasBeenSet = true; m_message.assign(value); }
+    inline ValidationException& WithMessage(const Aws::String& value) { SetMessage(value); return *this;}
+    inline ValidationException& WithMessage(Aws::String&& value) { SetMessage(std::move(value)); return *this;}
+    inline ValidationException& WithMessage(const char* value) { SetMessage(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The request was denied due to an invalid request error.</p>
@@ -53,25 +65,13 @@ namespace Model
     inline ValidationException& AddFieldList(const ValidationExceptionField& value) { m_fieldListHasBeenSet = true; m_fieldList.push_back(value); return *this; }
     inline ValidationException& AddFieldList(ValidationExceptionField&& value) { m_fieldListHasBeenSet = true; m_fieldList.push_back(std::move(value)); return *this; }
     ///@}
-
-    ///@{
-    
-    inline const Aws::String& GetMessage() const{ return m_message; }
-    inline bool MessageHasBeenSet() const { return m_messageHasBeenSet; }
-    inline void SetMessage(const Aws::String& value) { m_messageHasBeenSet = true; m_message = value; }
-    inline void SetMessage(Aws::String&& value) { m_messageHasBeenSet = true; m_message = std::move(value); }
-    inline void SetMessage(const char* value) { m_messageHasBeenSet = true; m_message.assign(value); }
-    inline ValidationException& WithMessage(const Aws::String& value) { SetMessage(value); return *this;}
-    inline ValidationException& WithMessage(Aws::String&& value) { SetMessage(std::move(value)); return *this;}
-    inline ValidationException& WithMessage(const char* value) { SetMessage(value); return *this;}
-    ///@}
   private:
 
-    Aws::Vector<ValidationExceptionField> m_fieldList;
-    bool m_fieldListHasBeenSet = false;
-
     Aws::String m_message;
     bool m_messageHasBeenSet = false;
+
+    Aws::Vector<ValidationExceptionField> m_fieldList;
+    bool m_fieldListHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationExceptionField.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationExceptionField.h
index 9cd0f6db5f0..843453ae4a8 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationExceptionField.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/ValidationExceptionField.h
@@ -38,20 +38,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    /**
-     * <p>The request was denied due to an invalid request error.</p>
-     */
-    inline const Aws::String& GetMessage() const{ return m_message; }
-    inline bool MessageHasBeenSet() const { return m_messageHasBeenSet; }
-    inline void SetMessage(const Aws::String& value) { m_messageHasBeenSet = true; m_message = value; }
-    inline void SetMessage(Aws::String&& value) { m_messageHasBeenSet = true; m_message = std::move(value); }
-    inline void SetMessage(const char* value) { m_messageHasBeenSet = true; m_message.assign(value); }
-    inline ValidationExceptionField& WithMessage(const Aws::String& value) { SetMessage(value); return *this;}
-    inline ValidationExceptionField& WithMessage(Aws::String&& value) { SetMessage(std::move(value)); return *this;}
-    inline ValidationExceptionField& WithMessage(const char* value) { SetMessage(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The request was denied due to an invalid request error.</p>
@@ -65,13 +51,27 @@ namespace Model
     inline ValidationExceptionField& WithPath(Aws::String&& value) { SetPath(std::move(value)); return *this;}
     inline ValidationExceptionField& WithPath(const char* value) { SetPath(value); return *this;}
     ///@}
-  private:
 
-    Aws::String m_message;
-    bool m_messageHasBeenSet = false;
+    ///@{
+    /**
+     * <p>The request was denied due to an invalid request error.</p>
+     */
+    inline const Aws::String& GetMessage() const{ return m_message; }
+    inline bool MessageHasBeenSet() const { return m_messageHasBeenSet; }
+    inline void SetMessage(const Aws::String& value) { m_messageHasBeenSet = true; m_message = value; }
+    inline void SetMessage(Aws::String&& value) { m_messageHasBeenSet = true; m_message = std::move(value); }
+    inline void SetMessage(const char* value) { m_messageHasBeenSet = true; m_message.assign(value); }
+    inline ValidationExceptionField& WithMessage(const Aws::String& value) { SetMessage(value); return *this;}
+    inline ValidationExceptionField& WithMessage(Aws::String&& value) { SetMessage(std::move(value)); return *this;}
+    inline ValidationExceptionField& WithMessage(const char* value) { SetMessage(value); return *this;}
+    ///@}
+  private:
 
     Aws::String m_path;
     bool m_pathHasBeenSet = false;
+
+    Aws::String m_message;
+    bool m_messageHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerificationFailedException.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerificationFailedException.h
index 5b14e3ff3fe..a8277d515b6 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerificationFailedException.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerificationFailedException.h
@@ -5,8 +5,8 @@
 
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
-#include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/payment-cryptography-data/model/VerificationFailedReason.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
 #include <utility>
 
 namespace Aws
@@ -38,18 +38,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
 
 
-    ///@{
-    
-    inline const Aws::String& GetMessage() const{ return m_message; }
-    inline bool MessageHasBeenSet() const { return m_messageHasBeenSet; }
-    inline void SetMessage(const Aws::String& value) { m_messageHasBeenSet = true; m_message = value; }
-    inline void SetMessage(Aws::String&& value) { m_messageHasBeenSet = true; m_message = std::move(value); }
-    inline void SetMessage(const char* value) { m_messageHasBeenSet = true; m_message.assign(value); }
-    inline VerificationFailedException& WithMessage(const Aws::String& value) { SetMessage(value); return *this;}
-    inline VerificationFailedException& WithMessage(Aws::String&& value) { SetMessage(std::move(value)); return *this;}
-    inline VerificationFailedException& WithMessage(const char* value) { SetMessage(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The reason for the exception.</p>
@@ -61,13 +49,25 @@ namespace Model
     inline VerificationFailedException& WithReason(const VerificationFailedReason& value) { SetReason(value); return *this;}
     inline VerificationFailedException& WithReason(VerificationFailedReason&& value) { SetReason(std::move(value)); return *this;}
     ///@}
-  private:
 
-    Aws::String m_message;
-    bool m_messageHasBeenSet = false;
+    ///@{
+    
+    inline const Aws::String& GetMessage() const{ return m_message; }
+    inline bool MessageHasBeenSet() const { return m_messageHasBeenSet; }
+    inline void SetMessage(const Aws::String& value) { m_messageHasBeenSet = true; m_message = value; }
+    inline void SetMessage(Aws::String&& value) { m_messageHasBeenSet = true; m_message = std::move(value); }
+    inline void SetMessage(const char* value) { m_messageHasBeenSet = true; m_message.assign(value); }
+    inline VerificationFailedException& WithMessage(const Aws::String& value) { SetMessage(value); return *this;}
+    inline VerificationFailedException& WithMessage(Aws::String&& value) { SetMessage(std::move(value)); return *this;}
+    inline VerificationFailedException& WithMessage(const char* value) { SetMessage(value); return *this;}
+    ///@}
+  private:
 
     VerificationFailedReason m_reason;
     bool m_reasonHasBeenSet = false;
+
+    Aws::String m_message;
+    bool m_messageHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramRequest.h
index bd078e8f6be..5040b445da2 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramRequest.h
@@ -7,9 +7,9 @@
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
-#include <aws/payment-cryptography-data/model/CryptogramAuthResponse.h>
 #include <aws/payment-cryptography-data/model/MajorKeyDerivationMode.h>
 #include <aws/payment-cryptography-data/model/SessionKeyDerivation.h>
+#include <aws/payment-cryptography-data/model/CryptogramAuthResponse.h>
 #include <utility>
 
 namespace Aws
@@ -35,6 +35,37 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::String SerializePayload() const override;
 
 
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the major encryption key that Amazon Web Services
+     * Payment Cryptography uses for ARQC verification.</p>
+     */
+    inline const Aws::String& GetKeyIdentifier() const{ return m_keyIdentifier; }
+    inline bool KeyIdentifierHasBeenSet() const { return m_keyIdentifierHasBeenSet; }
+    inline void SetKeyIdentifier(const Aws::String& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = value; }
+    inline void SetKeyIdentifier(Aws::String&& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = std::move(value); }
+    inline void SetKeyIdentifier(const char* value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier.assign(value); }
+    inline VerifyAuthRequestCryptogramRequest& WithKeyIdentifier(const Aws::String& value) { SetKeyIdentifier(value); return *this;}
+    inline VerifyAuthRequestCryptogramRequest& WithKeyIdentifier(Aws::String&& value) { SetKeyIdentifier(std::move(value)); return *this;}
+    inline VerifyAuthRequestCryptogramRequest& WithKeyIdentifier(const char* value) { SetKeyIdentifier(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The transaction data that Amazon Web Services Payment Cryptography uses for
+     * ARQC verification. The same transaction is used for ARQC generation outside of
+     * Amazon Web Services Payment Cryptography.</p>
+     */
+    inline const Aws::String& GetTransactionData() const{ return m_transactionData; }
+    inline bool TransactionDataHasBeenSet() const { return m_transactionDataHasBeenSet; }
+    inline void SetTransactionData(const Aws::String& value) { m_transactionDataHasBeenSet = true; m_transactionData = value; }
+    inline void SetTransactionData(Aws::String&& value) { m_transactionDataHasBeenSet = true; m_transactionData = std::move(value); }
+    inline void SetTransactionData(const char* value) { m_transactionDataHasBeenSet = true; m_transactionData.assign(value); }
+    inline VerifyAuthRequestCryptogramRequest& WithTransactionData(const Aws::String& value) { SetTransactionData(value); return *this;}
+    inline VerifyAuthRequestCryptogramRequest& WithTransactionData(Aws::String&& value) { SetTransactionData(std::move(value)); return *this;}
+    inline VerifyAuthRequestCryptogramRequest& WithTransactionData(const char* value) { SetTransactionData(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The auth request cryptogram imported into Amazon Web Services Payment
@@ -51,35 +82,6 @@ namespace Model
     inline VerifyAuthRequestCryptogramRequest& WithAuthRequestCryptogram(const char* value) { SetAuthRequestCryptogram(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The attributes and values for auth request cryptogram verification. These
-     * parameters are required in case using ARPC Method 1 or Method 2 for ARQC
-     * verification.</p>
-     */
-    inline const CryptogramAuthResponse& GetAuthResponseAttributes() const{ return m_authResponseAttributes; }
-    inline bool AuthResponseAttributesHasBeenSet() const { return m_authResponseAttributesHasBeenSet; }
-    inline void SetAuthResponseAttributes(const CryptogramAuthResponse& value) { m_authResponseAttributesHasBeenSet = true; m_authResponseAttributes = value; }
-    inline void SetAuthResponseAttributes(CryptogramAuthResponse&& value) { m_authResponseAttributesHasBeenSet = true; m_authResponseAttributes = std::move(value); }
-    inline VerifyAuthRequestCryptogramRequest& WithAuthResponseAttributes(const CryptogramAuthResponse& value) { SetAuthResponseAttributes(value); return *this;}
-    inline VerifyAuthRequestCryptogramRequest& WithAuthResponseAttributes(CryptogramAuthResponse&& value) { SetAuthResponseAttributes(std::move(value)); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>The <code>keyARN</code> of the major encryption key that Amazon Web Services
-     * Payment Cryptography uses for ARQC verification.</p>
-     */
-    inline const Aws::String& GetKeyIdentifier() const{ return m_keyIdentifier; }
-    inline bool KeyIdentifierHasBeenSet() const { return m_keyIdentifierHasBeenSet; }
-    inline void SetKeyIdentifier(const Aws::String& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = value; }
-    inline void SetKeyIdentifier(Aws::String&& value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier = std::move(value); }
-    inline void SetKeyIdentifier(const char* value) { m_keyIdentifierHasBeenSet = true; m_keyIdentifier.assign(value); }
-    inline VerifyAuthRequestCryptogramRequest& WithKeyIdentifier(const Aws::String& value) { SetKeyIdentifier(value); return *this;}
-    inline VerifyAuthRequestCryptogramRequest& WithKeyIdentifier(Aws::String&& value) { SetKeyIdentifier(std::move(value)); return *this;}
-    inline VerifyAuthRequestCryptogramRequest& WithKeyIdentifier(const char* value) { SetKeyIdentifier(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The method to use when deriving the major encryption key for ARQC
@@ -112,38 +114,36 @@ namespace Model
 
     ///@{
     /**
-     * <p>The transaction data that Amazon Web Services Payment Cryptography uses for
-     * ARQC verification. The same transaction is used for ARQC generation outside of
-     * Amazon Web Services Payment Cryptography.</p>
+     * <p>The attributes and values for auth request cryptogram verification. These
+     * parameters are required in case using ARPC Method 1 or Method 2 for ARQC
+     * verification.</p>
      */
-    inline const Aws::String& GetTransactionData() const{ return m_transactionData; }
-    inline bool TransactionDataHasBeenSet() const { return m_transactionDataHasBeenSet; }
-    inline void SetTransactionData(const Aws::String& value) { m_transactionDataHasBeenSet = true; m_transactionData = value; }
-    inline void SetTransactionData(Aws::String&& value) { m_transactionDataHasBeenSet = true; m_transactionData = std::move(value); }
-    inline void SetTransactionData(const char* value) { m_transactionDataHasBeenSet = true; m_transactionData.assign(value); }
-    inline VerifyAuthRequestCryptogramRequest& WithTransactionData(const Aws::String& value) { SetTransactionData(value); return *this;}
-    inline VerifyAuthRequestCryptogramRequest& WithTransactionData(Aws::String&& value) { SetTransactionData(std::move(value)); return *this;}
-    inline VerifyAuthRequestCryptogramRequest& WithTransactionData(const char* value) { SetTransactionData(value); return *this;}
+    inline const CryptogramAuthResponse& GetAuthResponseAttributes() const{ return m_authResponseAttributes; }
+    inline bool AuthResponseAttributesHasBeenSet() const { return m_authResponseAttributesHasBeenSet; }
+    inline void SetAuthResponseAttributes(const CryptogramAuthResponse& value) { m_authResponseAttributesHasBeenSet = true; m_authResponseAttributes = value; }
+    inline void SetAuthResponseAttributes(CryptogramAuthResponse&& value) { m_authResponseAttributesHasBeenSet = true; m_authResponseAttributes = std::move(value); }
+    inline VerifyAuthRequestCryptogramRequest& WithAuthResponseAttributes(const CryptogramAuthResponse& value) { SetAuthResponseAttributes(value); return *this;}
+    inline VerifyAuthRequestCryptogramRequest& WithAuthResponseAttributes(CryptogramAuthResponse&& value) { SetAuthResponseAttributes(std::move(value)); return *this;}
     ///@}
   private:
 
-    Aws::String m_authRequestCryptogram;
-    bool m_authRequestCryptogramHasBeenSet = false;
-
-    CryptogramAuthResponse m_authResponseAttributes;
-    bool m_authResponseAttributesHasBeenSet = false;
-
     Aws::String m_keyIdentifier;
     bool m_keyIdentifierHasBeenSet = false;
 
+    Aws::String m_transactionData;
+    bool m_transactionDataHasBeenSet = false;
+
+    Aws::String m_authRequestCryptogram;
+    bool m_authRequestCryptogramHasBeenSet = false;
+
     MajorKeyDerivationMode m_majorKeyDerivationMode;
     bool m_majorKeyDerivationModeHasBeenSet = false;
 
     SessionKeyDerivation m_sessionKeyDerivationAttributes;
     bool m_sessionKeyDerivationAttributesHasBeenSet = false;
 
-    Aws::String m_transactionData;
-    bool m_transactionDataHasBeenSet = false;
+    CryptogramAuthResponse m_authResponseAttributes;
+    bool m_authResponseAttributesHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramResult.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramResult.h
index a3c96ba2cc0..5e72639a642 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramResult.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyAuthRequestCryptogramResult.h
@@ -32,20 +32,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API VerifyAuthRequestCryptogramResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
 
 
-    ///@{
-    /**
-     * <p>The result for ARQC verification or ARPC generation within Amazon Web
-     * Services Payment Cryptography.</p>
-     */
-    inline const Aws::String& GetAuthResponseValue() const{ return m_authResponseValue; }
-    inline void SetAuthResponseValue(const Aws::String& value) { m_authResponseValue = value; }
-    inline void SetAuthResponseValue(Aws::String&& value) { m_authResponseValue = std::move(value); }
-    inline void SetAuthResponseValue(const char* value) { m_authResponseValue.assign(value); }
-    inline VerifyAuthRequestCryptogramResult& WithAuthResponseValue(const Aws::String& value) { SetAuthResponseValue(value); return *this;}
-    inline VerifyAuthRequestCryptogramResult& WithAuthResponseValue(Aws::String&& value) { SetAuthResponseValue(std::move(value)); return *this;}
-    inline VerifyAuthRequestCryptogramResult& WithAuthResponseValue(const char* value) { SetAuthResponseValue(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The <code>keyARN</code> of the major encryption key that Amazon Web Services
@@ -76,6 +62,20 @@ namespace Model
     inline VerifyAuthRequestCryptogramResult& WithKeyCheckValue(const char* value) { SetKeyCheckValue(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The result for ARQC verification or ARPC generation within Amazon Web
+     * Services Payment Cryptography.</p>
+     */
+    inline const Aws::String& GetAuthResponseValue() const{ return m_authResponseValue; }
+    inline void SetAuthResponseValue(const Aws::String& value) { m_authResponseValue = value; }
+    inline void SetAuthResponseValue(Aws::String&& value) { m_authResponseValue = std::move(value); }
+    inline void SetAuthResponseValue(const char* value) { m_authResponseValue.assign(value); }
+    inline VerifyAuthRequestCryptogramResult& WithAuthResponseValue(const Aws::String& value) { SetAuthResponseValue(value); return *this;}
+    inline VerifyAuthRequestCryptogramResult& WithAuthResponseValue(Aws::String&& value) { SetAuthResponseValue(std::move(value)); return *this;}
+    inline VerifyAuthRequestCryptogramResult& WithAuthResponseValue(const char* value) { SetAuthResponseValue(value); return *this;}
+    ///@}
+
     ///@{
     
     inline const Aws::String& GetRequestId() const{ return m_requestId; }
@@ -88,12 +88,12 @@ namespace Model
     ///@}
   private:
 
-    Aws::String m_authResponseValue;
-
     Aws::String m_keyArn;
 
     Aws::String m_keyCheckValue;
 
+    Aws::String m_authResponseValue;
+
     Aws::String m_requestId;
   };
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyCardValidationDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyCardValidationDataRequest.h
index d72aa9ba320..7ed8a52c2ff 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyCardValidationDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyCardValidationDataRequest.h
@@ -63,6 +63,19 @@ namespace Model
     inline VerifyCardValidationDataRequest& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The algorithm to use for verification of card data within Amazon Web Services
+     * Payment Cryptography.</p>
+     */
+    inline const CardVerificationAttributes& GetVerificationAttributes() const{ return m_verificationAttributes; }
+    inline bool VerificationAttributesHasBeenSet() const { return m_verificationAttributesHasBeenSet; }
+    inline void SetVerificationAttributes(const CardVerificationAttributes& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = value; }
+    inline void SetVerificationAttributes(CardVerificationAttributes&& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = std::move(value); }
+    inline VerifyCardValidationDataRequest& WithVerificationAttributes(const CardVerificationAttributes& value) { SetVerificationAttributes(value); return *this;}
+    inline VerifyCardValidationDataRequest& WithVerificationAttributes(CardVerificationAttributes&& value) { SetVerificationAttributes(std::move(value)); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The CVV or CSC value for use for card data verification within Amazon Web
@@ -77,19 +90,6 @@ namespace Model
     inline VerifyCardValidationDataRequest& WithValidationData(Aws::String&& value) { SetValidationData(std::move(value)); return *this;}
     inline VerifyCardValidationDataRequest& WithValidationData(const char* value) { SetValidationData(value); return *this;}
     ///@}
-
-    ///@{
-    /**
-     * <p>The algorithm to use for verification of card data within Amazon Web Services
-     * Payment Cryptography.</p>
-     */
-    inline const CardVerificationAttributes& GetVerificationAttributes() const{ return m_verificationAttributes; }
-    inline bool VerificationAttributesHasBeenSet() const { return m_verificationAttributesHasBeenSet; }
-    inline void SetVerificationAttributes(const CardVerificationAttributes& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = value; }
-    inline void SetVerificationAttributes(CardVerificationAttributes&& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = std::move(value); }
-    inline VerifyCardValidationDataRequest& WithVerificationAttributes(const CardVerificationAttributes& value) { SetVerificationAttributes(value); return *this;}
-    inline VerifyCardValidationDataRequest& WithVerificationAttributes(CardVerificationAttributes&& value) { SetVerificationAttributes(std::move(value)); return *this;}
-    ///@}
   private:
 
     Aws::String m_keyIdentifier;
@@ -98,11 +98,11 @@ namespace Model
     Aws::String m_primaryAccountNumber;
     bool m_primaryAccountNumberHasBeenSet = false;
 
-    Aws::String m_validationData;
-    bool m_validationDataHasBeenSet = false;
-
     CardVerificationAttributes m_verificationAttributes;
     bool m_verificationAttributesHasBeenSet = false;
+
+    Aws::String m_validationData;
+    bool m_validationDataHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyMacRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyMacRequest.h
index cca31593726..b58ff30a508 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyMacRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyMacRequest.h
@@ -48,30 +48,6 @@ namespace Model
     inline VerifyMacRequest& WithKeyIdentifier(const char* value) { SetKeyIdentifier(value); return *this;}
     ///@}
 
-    ///@{
-    /**
-     * <p>The MAC being verified.</p>
-     */
-    inline const Aws::String& GetMac() const{ return m_mac; }
-    inline bool MacHasBeenSet() const { return m_macHasBeenSet; }
-    inline void SetMac(const Aws::String& value) { m_macHasBeenSet = true; m_mac = value; }
-    inline void SetMac(Aws::String&& value) { m_macHasBeenSet = true; m_mac = std::move(value); }
-    inline void SetMac(const char* value) { m_macHasBeenSet = true; m_mac.assign(value); }
-    inline VerifyMacRequest& WithMac(const Aws::String& value) { SetMac(value); return *this;}
-    inline VerifyMacRequest& WithMac(Aws::String&& value) { SetMac(std::move(value)); return *this;}
-    inline VerifyMacRequest& WithMac(const char* value) { SetMac(value); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>The length of the MAC.</p>
-     */
-    inline int GetMacLength() const{ return m_macLength; }
-    inline bool MacLengthHasBeenSet() const { return m_macLengthHasBeenSet; }
-    inline void SetMacLength(int value) { m_macLengthHasBeenSet = true; m_macLength = value; }
-    inline VerifyMacRequest& WithMacLength(int value) { SetMacLength(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The data on for which MAC is under verification. This value must be
@@ -87,6 +63,20 @@ namespace Model
     inline VerifyMacRequest& WithMessageData(const char* value) { SetMessageData(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The MAC being verified.</p>
+     */
+    inline const Aws::String& GetMac() const{ return m_mac; }
+    inline bool MacHasBeenSet() const { return m_macHasBeenSet; }
+    inline void SetMac(const Aws::String& value) { m_macHasBeenSet = true; m_mac = value; }
+    inline void SetMac(Aws::String&& value) { m_macHasBeenSet = true; m_mac = std::move(value); }
+    inline void SetMac(const char* value) { m_macHasBeenSet = true; m_mac.assign(value); }
+    inline VerifyMacRequest& WithMac(const Aws::String& value) { SetMac(value); return *this;}
+    inline VerifyMacRequest& WithMac(Aws::String&& value) { SetMac(std::move(value)); return *this;}
+    inline VerifyMacRequest& WithMac(const char* value) { SetMac(value); return *this;}
+    ///@}
+
     ///@{
     /**
      * <p>The attributes and data values to use for MAC verification within Amazon Web
@@ -99,22 +89,32 @@ namespace Model
     inline VerifyMacRequest& WithVerificationAttributes(const MacAttributes& value) { SetVerificationAttributes(value); return *this;}
     inline VerifyMacRequest& WithVerificationAttributes(MacAttributes&& value) { SetVerificationAttributes(std::move(value)); return *this;}
     ///@}
+
+    ///@{
+    /**
+     * <p>The length of the MAC.</p>
+     */
+    inline int GetMacLength() const{ return m_macLength; }
+    inline bool MacLengthHasBeenSet() const { return m_macLengthHasBeenSet; }
+    inline void SetMacLength(int value) { m_macLengthHasBeenSet = true; m_macLength = value; }
+    inline VerifyMacRequest& WithMacLength(int value) { SetMacLength(value); return *this;}
+    ///@}
   private:
 
     Aws::String m_keyIdentifier;
     bool m_keyIdentifierHasBeenSet = false;
 
-    Aws::String m_mac;
-    bool m_macHasBeenSet = false;
-
-    int m_macLength;
-    bool m_macLengthHasBeenSet = false;
-
     Aws::String m_messageData;
     bool m_messageDataHasBeenSet = false;
 
+    Aws::String m_mac;
+    bool m_macHasBeenSet = false;
+
     MacAttributes m_verificationAttributes;
     bool m_verificationAttributesHasBeenSet = false;
+
+    int m_macLength;
+    bool m_macLengthHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataRequest.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataRequest.h
index 8eba0524e34..caab8c67a3d 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataRequest.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataRequest.h
@@ -6,10 +6,10 @@
 #pragma once
 #include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
 #include <aws/payment-cryptography-data/PaymentCryptographyDataRequest.h>
-#include <aws/payment-cryptography-data/model/DukptAttributes.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
-#include <aws/payment-cryptography-data/model/PinBlockFormatForPinData.h>
 #include <aws/payment-cryptography-data/model/PinVerificationAttributes.h>
+#include <aws/payment-cryptography-data/model/PinBlockFormatForPinData.h>
+#include <aws/payment-cryptography-data/model/DukptAttributes.h>
 #include <utility>
 
 namespace Aws
@@ -37,14 +37,43 @@ namespace Model
 
     ///@{
     /**
-     * <p>The attributes and values for the DUKPT encrypted PIN block data.</p>
+     * <p>The <code>keyARN</code> of the PIN verification key.</p>
      */
-    inline const DukptAttributes& GetDukptAttributes() const{ return m_dukptAttributes; }
-    inline bool DukptAttributesHasBeenSet() const { return m_dukptAttributesHasBeenSet; }
-    inline void SetDukptAttributes(const DukptAttributes& value) { m_dukptAttributesHasBeenSet = true; m_dukptAttributes = value; }
-    inline void SetDukptAttributes(DukptAttributes&& value) { m_dukptAttributesHasBeenSet = true; m_dukptAttributes = std::move(value); }
-    inline VerifyPinDataRequest& WithDukptAttributes(const DukptAttributes& value) { SetDukptAttributes(value); return *this;}
-    inline VerifyPinDataRequest& WithDukptAttributes(DukptAttributes&& value) { SetDukptAttributes(std::move(value)); return *this;}
+    inline const Aws::String& GetVerificationKeyIdentifier() const{ return m_verificationKeyIdentifier; }
+    inline bool VerificationKeyIdentifierHasBeenSet() const { return m_verificationKeyIdentifierHasBeenSet; }
+    inline void SetVerificationKeyIdentifier(const Aws::String& value) { m_verificationKeyIdentifierHasBeenSet = true; m_verificationKeyIdentifier = value; }
+    inline void SetVerificationKeyIdentifier(Aws::String&& value) { m_verificationKeyIdentifierHasBeenSet = true; m_verificationKeyIdentifier = std::move(value); }
+    inline void SetVerificationKeyIdentifier(const char* value) { m_verificationKeyIdentifierHasBeenSet = true; m_verificationKeyIdentifier.assign(value); }
+    inline VerifyPinDataRequest& WithVerificationKeyIdentifier(const Aws::String& value) { SetVerificationKeyIdentifier(value); return *this;}
+    inline VerifyPinDataRequest& WithVerificationKeyIdentifier(Aws::String&& value) { SetVerificationKeyIdentifier(std::move(value)); return *this;}
+    inline VerifyPinDataRequest& WithVerificationKeyIdentifier(const char* value) { SetVerificationKeyIdentifier(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the encryption key under which the PIN block data
+     * is encrypted. This key type can be PEK or BDK.</p>
+     */
+    inline const Aws::String& GetEncryptionKeyIdentifier() const{ return m_encryptionKeyIdentifier; }
+    inline bool EncryptionKeyIdentifierHasBeenSet() const { return m_encryptionKeyIdentifierHasBeenSet; }
+    inline void SetEncryptionKeyIdentifier(const Aws::String& value) { m_encryptionKeyIdentifierHasBeenSet = true; m_encryptionKeyIdentifier = value; }
+    inline void SetEncryptionKeyIdentifier(Aws::String&& value) { m_encryptionKeyIdentifierHasBeenSet = true; m_encryptionKeyIdentifier = std::move(value); }
+    inline void SetEncryptionKeyIdentifier(const char* value) { m_encryptionKeyIdentifierHasBeenSet = true; m_encryptionKeyIdentifier.assign(value); }
+    inline VerifyPinDataRequest& WithEncryptionKeyIdentifier(const Aws::String& value) { SetEncryptionKeyIdentifier(value); return *this;}
+    inline VerifyPinDataRequest& WithEncryptionKeyIdentifier(Aws::String&& value) { SetEncryptionKeyIdentifier(std::move(value)); return *this;}
+    inline VerifyPinDataRequest& WithEncryptionKeyIdentifier(const char* value) { SetEncryptionKeyIdentifier(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The attributes and values for PIN data verification.</p>
+     */
+    inline const PinVerificationAttributes& GetVerificationAttributes() const{ return m_verificationAttributes; }
+    inline bool VerificationAttributesHasBeenSet() const { return m_verificationAttributesHasBeenSet; }
+    inline void SetVerificationAttributes(const PinVerificationAttributes& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = value; }
+    inline void SetVerificationAttributes(PinVerificationAttributes&& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = std::move(value); }
+    inline VerifyPinDataRequest& WithVerificationAttributes(const PinVerificationAttributes& value) { SetVerificationAttributes(value); return *this;}
+    inline VerifyPinDataRequest& WithVerificationAttributes(PinVerificationAttributes&& value) { SetVerificationAttributes(std::move(value)); return *this;}
     ///@}
 
     ///@{
@@ -64,17 +93,17 @@ namespace Model
 
     ///@{
     /**
-     * <p>The <code>keyARN</code> of the encryption key under which the PIN block data
-     * is encrypted. This key type can be PEK or BDK.</p>
+     * <p>The Primary Account Number (PAN), a unique identifier for a payment credit or
+     * debit card that associates the card with a specific account holder.</p>
      */
-    inline const Aws::String& GetEncryptionKeyIdentifier() const{ return m_encryptionKeyIdentifier; }
-    inline bool EncryptionKeyIdentifierHasBeenSet() const { return m_encryptionKeyIdentifierHasBeenSet; }
-    inline void SetEncryptionKeyIdentifier(const Aws::String& value) { m_encryptionKeyIdentifierHasBeenSet = true; m_encryptionKeyIdentifier = value; }
-    inline void SetEncryptionKeyIdentifier(Aws::String&& value) { m_encryptionKeyIdentifierHasBeenSet = true; m_encryptionKeyIdentifier = std::move(value); }
-    inline void SetEncryptionKeyIdentifier(const char* value) { m_encryptionKeyIdentifierHasBeenSet = true; m_encryptionKeyIdentifier.assign(value); }
-    inline VerifyPinDataRequest& WithEncryptionKeyIdentifier(const Aws::String& value) { SetEncryptionKeyIdentifier(value); return *this;}
-    inline VerifyPinDataRequest& WithEncryptionKeyIdentifier(Aws::String&& value) { SetEncryptionKeyIdentifier(std::move(value)); return *this;}
-    inline VerifyPinDataRequest& WithEncryptionKeyIdentifier(const char* value) { SetEncryptionKeyIdentifier(value); return *this;}
+    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
+    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
+    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
+    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
+    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
+    inline VerifyPinDataRequest& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
+    inline VerifyPinDataRequest& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
+    inline VerifyPinDataRequest& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
     ///@}
 
     ///@{
@@ -108,54 +137,31 @@ namespace Model
 
     ///@{
     /**
-     * <p>The Primary Account Number (PAN), a unique identifier for a payment credit or
-     * debit card that associates the card with a specific account holder.</p>
+     * <p>The attributes and values for the DUKPT encrypted PIN block data.</p>
      */
-    inline const Aws::String& GetPrimaryAccountNumber() const{ return m_primaryAccountNumber; }
-    inline bool PrimaryAccountNumberHasBeenSet() const { return m_primaryAccountNumberHasBeenSet; }
-    inline void SetPrimaryAccountNumber(const Aws::String& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = value; }
-    inline void SetPrimaryAccountNumber(Aws::String&& value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber = std::move(value); }
-    inline void SetPrimaryAccountNumber(const char* value) { m_primaryAccountNumberHasBeenSet = true; m_primaryAccountNumber.assign(value); }
-    inline VerifyPinDataRequest& WithPrimaryAccountNumber(const Aws::String& value) { SetPrimaryAccountNumber(value); return *this;}
-    inline VerifyPinDataRequest& WithPrimaryAccountNumber(Aws::String&& value) { SetPrimaryAccountNumber(std::move(value)); return *this;}
-    inline VerifyPinDataRequest& WithPrimaryAccountNumber(const char* value) { SetPrimaryAccountNumber(value); return *this;}
+    inline const DukptAttributes& GetDukptAttributes() const{ return m_dukptAttributes; }
+    inline bool DukptAttributesHasBeenSet() const { return m_dukptAttributesHasBeenSet; }
+    inline void SetDukptAttributes(const DukptAttributes& value) { m_dukptAttributesHasBeenSet = true; m_dukptAttributes = value; }
+    inline void SetDukptAttributes(DukptAttributes&& value) { m_dukptAttributesHasBeenSet = true; m_dukptAttributes = std::move(value); }
+    inline VerifyPinDataRequest& WithDukptAttributes(const DukptAttributes& value) { SetDukptAttributes(value); return *this;}
+    inline VerifyPinDataRequest& WithDukptAttributes(DukptAttributes&& value) { SetDukptAttributes(std::move(value)); return *this;}
     ///@}
+  private:
 
-    ///@{
-    /**
-     * <p>The attributes and values for PIN data verification.</p>
-     */
-    inline const PinVerificationAttributes& GetVerificationAttributes() const{ return m_verificationAttributes; }
-    inline bool VerificationAttributesHasBeenSet() const { return m_verificationAttributesHasBeenSet; }
-    inline void SetVerificationAttributes(const PinVerificationAttributes& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = value; }
-    inline void SetVerificationAttributes(PinVerificationAttributes&& value) { m_verificationAttributesHasBeenSet = true; m_verificationAttributes = std::move(value); }
-    inline VerifyPinDataRequest& WithVerificationAttributes(const PinVerificationAttributes& value) { SetVerificationAttributes(value); return *this;}
-    inline VerifyPinDataRequest& WithVerificationAttributes(PinVerificationAttributes&& value) { SetVerificationAttributes(std::move(value)); return *this;}
-    ///@}
+    Aws::String m_verificationKeyIdentifier;
+    bool m_verificationKeyIdentifierHasBeenSet = false;
 
-    ///@{
-    /**
-     * <p>The <code>keyARN</code> of the PIN verification key.</p>
-     */
-    inline const Aws::String& GetVerificationKeyIdentifier() const{ return m_verificationKeyIdentifier; }
-    inline bool VerificationKeyIdentifierHasBeenSet() const { return m_verificationKeyIdentifierHasBeenSet; }
-    inline void SetVerificationKeyIdentifier(const Aws::String& value) { m_verificationKeyIdentifierHasBeenSet = true; m_verificationKeyIdentifier = value; }
-    inline void SetVerificationKeyIdentifier(Aws::String&& value) { m_verificationKeyIdentifierHasBeenSet = true; m_verificationKeyIdentifier = std::move(value); }
-    inline void SetVerificationKeyIdentifier(const char* value) { m_verificationKeyIdentifierHasBeenSet = true; m_verificationKeyIdentifier.assign(value); }
-    inline VerifyPinDataRequest& WithVerificationKeyIdentifier(const Aws::String& value) { SetVerificationKeyIdentifier(value); return *this;}
-    inline VerifyPinDataRequest& WithVerificationKeyIdentifier(Aws::String&& value) { SetVerificationKeyIdentifier(std::move(value)); return *this;}
-    inline VerifyPinDataRequest& WithVerificationKeyIdentifier(const char* value) { SetVerificationKeyIdentifier(value); return *this;}
-    ///@}
-  private:
+    Aws::String m_encryptionKeyIdentifier;
+    bool m_encryptionKeyIdentifierHasBeenSet = false;
 
-    DukptAttributes m_dukptAttributes;
-    bool m_dukptAttributesHasBeenSet = false;
+    PinVerificationAttributes m_verificationAttributes;
+    bool m_verificationAttributesHasBeenSet = false;
 
     Aws::String m_encryptedPinBlock;
     bool m_encryptedPinBlockHasBeenSet = false;
 
-    Aws::String m_encryptionKeyIdentifier;
-    bool m_encryptionKeyIdentifierHasBeenSet = false;
+    Aws::String m_primaryAccountNumber;
+    bool m_primaryAccountNumberHasBeenSet = false;
 
     PinBlockFormatForPinData m_pinBlockFormat;
     bool m_pinBlockFormatHasBeenSet = false;
@@ -163,14 +169,8 @@ namespace Model
     int m_pinDataLength;
     bool m_pinDataLengthHasBeenSet = false;
 
-    Aws::String m_primaryAccountNumber;
-    bool m_primaryAccountNumberHasBeenSet = false;
-
-    PinVerificationAttributes m_verificationAttributes;
-    bool m_verificationAttributesHasBeenSet = false;
-
-    Aws::String m_verificationKeyIdentifier;
-    bool m_verificationKeyIdentifierHasBeenSet = false;
+    DukptAttributes m_dukptAttributes;
+    bool m_dukptAttributesHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataResult.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataResult.h
index 86d53b00c7e..384bbec6215 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataResult.h
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/VerifyPinDataResult.h
@@ -32,36 +32,6 @@ namespace Model
     AWS_PAYMENTCRYPTOGRAPHYDATA_API VerifyPinDataResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Json::JsonValue>& result);
 
 
-    ///@{
-    /**
-     * <p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment
-     * Cryptography uses for encrypted pin block generation.</p>
-     */
-    inline const Aws::String& GetEncryptionKeyArn() const{ return m_encryptionKeyArn; }
-    inline void SetEncryptionKeyArn(const Aws::String& value) { m_encryptionKeyArn = value; }
-    inline void SetEncryptionKeyArn(Aws::String&& value) { m_encryptionKeyArn = std::move(value); }
-    inline void SetEncryptionKeyArn(const char* value) { m_encryptionKeyArn.assign(value); }
-    inline VerifyPinDataResult& WithEncryptionKeyArn(const Aws::String& value) { SetEncryptionKeyArn(value); return *this;}
-    inline VerifyPinDataResult& WithEncryptionKeyArn(Aws::String&& value) { SetEncryptionKeyArn(std::move(value)); return *this;}
-    inline VerifyPinDataResult& WithEncryptionKeyArn(const char* value) { SetEncryptionKeyArn(value); return *this;}
-    ///@}
-
-    ///@{
-    /**
-     * <p>The key check value (KCV) of the encryption key. The KCV is used to check if
-     * all parties holding a given key have the same key or to detect that a key has
-     * changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV
-     * according to the CMAC specification.</p>
-     */
-    inline const Aws::String& GetEncryptionKeyCheckValue() const{ return m_encryptionKeyCheckValue; }
-    inline void SetEncryptionKeyCheckValue(const Aws::String& value) { m_encryptionKeyCheckValue = value; }
-    inline void SetEncryptionKeyCheckValue(Aws::String&& value) { m_encryptionKeyCheckValue = std::move(value); }
-    inline void SetEncryptionKeyCheckValue(const char* value) { m_encryptionKeyCheckValue.assign(value); }
-    inline VerifyPinDataResult& WithEncryptionKeyCheckValue(const Aws::String& value) { SetEncryptionKeyCheckValue(value); return *this;}
-    inline VerifyPinDataResult& WithEncryptionKeyCheckValue(Aws::String&& value) { SetEncryptionKeyCheckValue(std::move(value)); return *this;}
-    inline VerifyPinDataResult& WithEncryptionKeyCheckValue(const char* value) { SetEncryptionKeyCheckValue(value); return *this;}
-    ///@}
-
     ///@{
     /**
      * <p>The <code>keyARN</code> of the PIN encryption key that Amazon Web Services
@@ -92,6 +62,36 @@ namespace Model
     inline VerifyPinDataResult& WithVerificationKeyCheckValue(const char* value) { SetVerificationKeyCheckValue(value); return *this;}
     ///@}
 
+    ///@{
+    /**
+     * <p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment
+     * Cryptography uses for encrypted pin block generation.</p>
+     */
+    inline const Aws::String& GetEncryptionKeyArn() const{ return m_encryptionKeyArn; }
+    inline void SetEncryptionKeyArn(const Aws::String& value) { m_encryptionKeyArn = value; }
+    inline void SetEncryptionKeyArn(Aws::String&& value) { m_encryptionKeyArn = std::move(value); }
+    inline void SetEncryptionKeyArn(const char* value) { m_encryptionKeyArn.assign(value); }
+    inline VerifyPinDataResult& WithEncryptionKeyArn(const Aws::String& value) { SetEncryptionKeyArn(value); return *this;}
+    inline VerifyPinDataResult& WithEncryptionKeyArn(Aws::String&& value) { SetEncryptionKeyArn(std::move(value)); return *this;}
+    inline VerifyPinDataResult& WithEncryptionKeyArn(const char* value) { SetEncryptionKeyArn(value); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The key check value (KCV) of the encryption key. The KCV is used to check if
+     * all parties holding a given key have the same key or to detect that a key has
+     * changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV
+     * according to the CMAC specification.</p>
+     */
+    inline const Aws::String& GetEncryptionKeyCheckValue() const{ return m_encryptionKeyCheckValue; }
+    inline void SetEncryptionKeyCheckValue(const Aws::String& value) { m_encryptionKeyCheckValue = value; }
+    inline void SetEncryptionKeyCheckValue(Aws::String&& value) { m_encryptionKeyCheckValue = std::move(value); }
+    inline void SetEncryptionKeyCheckValue(const char* value) { m_encryptionKeyCheckValue.assign(value); }
+    inline VerifyPinDataResult& WithEncryptionKeyCheckValue(const Aws::String& value) { SetEncryptionKeyCheckValue(value); return *this;}
+    inline VerifyPinDataResult& WithEncryptionKeyCheckValue(Aws::String&& value) { SetEncryptionKeyCheckValue(std::move(value)); return *this;}
+    inline VerifyPinDataResult& WithEncryptionKeyCheckValue(const char* value) { SetEncryptionKeyCheckValue(value); return *this;}
+    ///@}
+
     ///@{
     
     inline const Aws::String& GetRequestId() const{ return m_requestId; }
@@ -104,14 +104,14 @@ namespace Model
     ///@}
   private:
 
-    Aws::String m_encryptionKeyArn;
-
-    Aws::String m_encryptionKeyCheckValue;
-
     Aws::String m_verificationKeyArn;
 
     Aws::String m_verificationKeyCheckValue;
 
+    Aws::String m_encryptionKeyArn;
+
+    Aws::String m_encryptionKeyCheckValue;
+
     Aws::String m_requestId;
   };
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/WrappedKey.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/WrappedKey.h
new file mode 100644
index 00000000000..8abc6f55993
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/WrappedKey.h
@@ -0,0 +1,82 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
+#include <aws/payment-cryptography-data/model/WrappedKeyMaterial.h>
+#include <aws/payment-cryptography-data/model/KeyCheckValueAlgorithm.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace PaymentCryptographyData
+{
+namespace Model
+{
+
+  /**
+   * <p>Parameter information of a WrappedKeyBlock for encryption key
+   * exchange.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/payment-cryptography-data-2022-02-03/WrappedKey">AWS
+   * API Reference</a></p>
+   */
+  class WrappedKey
+  {
+  public:
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API WrappedKey();
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API WrappedKey(Aws::Utils::Json::JsonView jsonValue);
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API WrappedKey& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    ///@{
+    /**
+     * <p>Parameter information of a WrappedKeyBlock for encryption key exchange.</p>
+     */
+    inline const WrappedKeyMaterial& GetWrappedKeyMaterial() const{ return m_wrappedKeyMaterial; }
+    inline bool WrappedKeyMaterialHasBeenSet() const { return m_wrappedKeyMaterialHasBeenSet; }
+    inline void SetWrappedKeyMaterial(const WrappedKeyMaterial& value) { m_wrappedKeyMaterialHasBeenSet = true; m_wrappedKeyMaterial = value; }
+    inline void SetWrappedKeyMaterial(WrappedKeyMaterial&& value) { m_wrappedKeyMaterialHasBeenSet = true; m_wrappedKeyMaterial = std::move(value); }
+    inline WrappedKey& WithWrappedKeyMaterial(const WrappedKeyMaterial& value) { SetWrappedKeyMaterial(value); return *this;}
+    inline WrappedKey& WithWrappedKeyMaterial(WrappedKeyMaterial&& value) { SetWrappedKeyMaterial(std::move(value)); return *this;}
+    ///@}
+
+    ///@{
+    /**
+     * <p>The algorithm that Amazon Web Services Payment Cryptography uses to calculate
+     * the key check value (KCV). It is used to validate the key integrity.</p> <p>For
+     * TDES keys, the KCV is computed by encrypting 8 bytes, each with value of zero,
+     * with the key to be checked and retaining the 3 highest order bytes of the
+     * encrypted result. For AES keys, the KCV is computed using a CMAC algorithm where
+     * the input data is 16 bytes of zero and retaining the 3 highest order bytes of
+     * the encrypted result.</p>
+     */
+    inline const KeyCheckValueAlgorithm& GetKeyCheckValueAlgorithm() const{ return m_keyCheckValueAlgorithm; }
+    inline bool KeyCheckValueAlgorithmHasBeenSet() const { return m_keyCheckValueAlgorithmHasBeenSet; }
+    inline void SetKeyCheckValueAlgorithm(const KeyCheckValueAlgorithm& value) { m_keyCheckValueAlgorithmHasBeenSet = true; m_keyCheckValueAlgorithm = value; }
+    inline void SetKeyCheckValueAlgorithm(KeyCheckValueAlgorithm&& value) { m_keyCheckValueAlgorithmHasBeenSet = true; m_keyCheckValueAlgorithm = std::move(value); }
+    inline WrappedKey& WithKeyCheckValueAlgorithm(const KeyCheckValueAlgorithm& value) { SetKeyCheckValueAlgorithm(value); return *this;}
+    inline WrappedKey& WithKeyCheckValueAlgorithm(KeyCheckValueAlgorithm&& value) { SetKeyCheckValueAlgorithm(std::move(value)); return *this;}
+    ///@}
+  private:
+
+    WrappedKeyMaterial m_wrappedKeyMaterial;
+    bool m_wrappedKeyMaterialHasBeenSet = false;
+
+    KeyCheckValueAlgorithm m_keyCheckValueAlgorithm;
+    bool m_keyCheckValueAlgorithmHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace PaymentCryptographyData
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/WrappedKeyMaterial.h b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/WrappedKeyMaterial.h
new file mode 100644
index 00000000000..a629f17821c
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/include/aws/payment-cryptography-data/model/WrappedKeyMaterial.h
@@ -0,0 +1,62 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/payment-cryptography-data/PaymentCryptographyData_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace PaymentCryptographyData
+{
+namespace Model
+{
+
+  /**
+   * <p>Parameter information of a WrappedKeyBlock for encryption key
+   * exchange.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/payment-cryptography-data-2022-02-03/WrappedKeyMaterial">AWS
+   * API Reference</a></p>
+   */
+  class WrappedKeyMaterial
+  {
+  public:
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API WrappedKeyMaterial();
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API WrappedKeyMaterial(Aws::Utils::Json::JsonView jsonValue);
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API WrappedKeyMaterial& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_PAYMENTCRYPTOGRAPHYDATA_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    ///@{
+    /**
+     * <p>The TR-31 wrapped key block.</p>
+     */
+    inline const Aws::String& GetTr31KeyBlock() const{ return m_tr31KeyBlock; }
+    inline bool Tr31KeyBlockHasBeenSet() const { return m_tr31KeyBlockHasBeenSet; }
+    inline void SetTr31KeyBlock(const Aws::String& value) { m_tr31KeyBlockHasBeenSet = true; m_tr31KeyBlock = value; }
+    inline void SetTr31KeyBlock(Aws::String&& value) { m_tr31KeyBlockHasBeenSet = true; m_tr31KeyBlock = std::move(value); }
+    inline void SetTr31KeyBlock(const char* value) { m_tr31KeyBlockHasBeenSet = true; m_tr31KeyBlock.assign(value); }
+    inline WrappedKeyMaterial& WithTr31KeyBlock(const Aws::String& value) { SetTr31KeyBlock(value); return *this;}
+    inline WrappedKeyMaterial& WithTr31KeyBlock(Aws::String&& value) { SetTr31KeyBlock(std::move(value)); return *this;}
+    inline WrappedKeyMaterial& WithTr31KeyBlock(const char* value) { SetTr31KeyBlock(value); return *this;}
+    ///@}
+  private:
+
+    Aws::String m_tr31KeyBlock;
+    bool m_tr31KeyBlockHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace PaymentCryptographyData
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardGenerationAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardGenerationAttributes.cpp
index e0c6f6261ea..e9c1815cb23 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardGenerationAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardGenerationAttributes.cpp
@@ -21,9 +21,9 @@ namespace Model
 CardGenerationAttributes::CardGenerationAttributes() : 
     m_amexCardSecurityCodeVersion1HasBeenSet(false),
     m_amexCardSecurityCodeVersion2HasBeenSet(false),
-    m_cardHolderVerificationValueHasBeenSet(false),
     m_cardVerificationValue1HasBeenSet(false),
     m_cardVerificationValue2HasBeenSet(false),
+    m_cardHolderVerificationValueHasBeenSet(false),
     m_dynamicCardVerificationCodeHasBeenSet(false),
     m_dynamicCardVerificationValueHasBeenSet(false)
 {
@@ -51,13 +51,6 @@ CardGenerationAttributes& CardGenerationAttributes::operator =(JsonView jsonValu
     m_amexCardSecurityCodeVersion2HasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("CardHolderVerificationValue"))
-  {
-    m_cardHolderVerificationValue = jsonValue.GetObject("CardHolderVerificationValue");
-
-    m_cardHolderVerificationValueHasBeenSet = true;
-  }
-
   if(jsonValue.ValueExists("CardVerificationValue1"))
   {
     m_cardVerificationValue1 = jsonValue.GetObject("CardVerificationValue1");
@@ -72,6 +65,13 @@ CardGenerationAttributes& CardGenerationAttributes::operator =(JsonView jsonValu
     m_cardVerificationValue2HasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("CardHolderVerificationValue"))
+  {
+    m_cardHolderVerificationValue = jsonValue.GetObject("CardHolderVerificationValue");
+
+    m_cardHolderVerificationValueHasBeenSet = true;
+  }
+
   if(jsonValue.ValueExists("DynamicCardVerificationCode"))
   {
     m_dynamicCardVerificationCode = jsonValue.GetObject("DynamicCardVerificationCode");
@@ -105,12 +105,6 @@ JsonValue CardGenerationAttributes::Jsonize() const
 
   }
 
-  if(m_cardHolderVerificationValueHasBeenSet)
-  {
-   payload.WithObject("CardHolderVerificationValue", m_cardHolderVerificationValue.Jsonize());
-
-  }
-
   if(m_cardVerificationValue1HasBeenSet)
   {
    payload.WithObject("CardVerificationValue1", m_cardVerificationValue1.Jsonize());
@@ -123,6 +117,12 @@ JsonValue CardGenerationAttributes::Jsonize() const
 
   }
 
+  if(m_cardHolderVerificationValueHasBeenSet)
+  {
+   payload.WithObject("CardHolderVerificationValue", m_cardHolderVerificationValue.Jsonize());
+
+  }
+
   if(m_dynamicCardVerificationCodeHasBeenSet)
   {
    payload.WithObject("DynamicCardVerificationCode", m_dynamicCardVerificationCode.Jsonize());
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardHolderVerificationValue.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardHolderVerificationValue.cpp
index 990258138f8..9f54088962e 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardHolderVerificationValue.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardHolderVerificationValue.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 CardHolderVerificationValue::CardHolderVerificationValue() : 
-    m_applicationTransactionCounterHasBeenSet(false),
+    m_unpredictableNumberHasBeenSet(false),
     m_panSequenceNumberHasBeenSet(false),
-    m_unpredictableNumberHasBeenSet(false)
+    m_applicationTransactionCounterHasBeenSet(false)
 {
 }
 
@@ -33,11 +33,11 @@ CardHolderVerificationValue::CardHolderVerificationValue(JsonView jsonValue)
 
 CardHolderVerificationValue& CardHolderVerificationValue::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
+  if(jsonValue.ValueExists("UnpredictableNumber"))
   {
-    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
+    m_unpredictableNumber = jsonValue.GetString("UnpredictableNumber");
 
-    m_applicationTransactionCounterHasBeenSet = true;
+    m_unpredictableNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PanSequenceNumber"))
@@ -47,11 +47,11 @@ CardHolderVerificationValue& CardHolderVerificationValue::operator =(JsonView js
     m_panSequenceNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("UnpredictableNumber"))
+  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
   {
-    m_unpredictableNumber = jsonValue.GetString("UnpredictableNumber");
+    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
 
-    m_unpredictableNumberHasBeenSet = true;
+    m_applicationTransactionCounterHasBeenSet = true;
   }
 
   return *this;
@@ -61,9 +61,9 @@ JsonValue CardHolderVerificationValue::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_applicationTransactionCounterHasBeenSet)
+  if(m_unpredictableNumberHasBeenSet)
   {
-   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
+   payload.WithString("UnpredictableNumber", m_unpredictableNumber);
 
   }
 
@@ -73,9 +73,9 @@ JsonValue CardHolderVerificationValue::Jsonize() const
 
   }
 
-  if(m_unpredictableNumberHasBeenSet)
+  if(m_applicationTransactionCounterHasBeenSet)
   {
-   payload.WithString("UnpredictableNumber", m_unpredictableNumber);
+   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardVerificationAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardVerificationAttributes.cpp
index 5e72e24d614..ddba4569db2 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardVerificationAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/CardVerificationAttributes.cpp
@@ -21,12 +21,12 @@ namespace Model
 CardVerificationAttributes::CardVerificationAttributes() : 
     m_amexCardSecurityCodeVersion1HasBeenSet(false),
     m_amexCardSecurityCodeVersion2HasBeenSet(false),
-    m_cardHolderVerificationValueHasBeenSet(false),
     m_cardVerificationValue1HasBeenSet(false),
     m_cardVerificationValue2HasBeenSet(false),
-    m_discoverDynamicCardVerificationCodeHasBeenSet(false),
+    m_cardHolderVerificationValueHasBeenSet(false),
     m_dynamicCardVerificationCodeHasBeenSet(false),
-    m_dynamicCardVerificationValueHasBeenSet(false)
+    m_dynamicCardVerificationValueHasBeenSet(false),
+    m_discoverDynamicCardVerificationCodeHasBeenSet(false)
 {
 }
 
@@ -52,13 +52,6 @@ CardVerificationAttributes& CardVerificationAttributes::operator =(JsonView json
     m_amexCardSecurityCodeVersion2HasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("CardHolderVerificationValue"))
-  {
-    m_cardHolderVerificationValue = jsonValue.GetObject("CardHolderVerificationValue");
-
-    m_cardHolderVerificationValueHasBeenSet = true;
-  }
-
   if(jsonValue.ValueExists("CardVerificationValue1"))
   {
     m_cardVerificationValue1 = jsonValue.GetObject("CardVerificationValue1");
@@ -73,11 +66,11 @@ CardVerificationAttributes& CardVerificationAttributes::operator =(JsonView json
     m_cardVerificationValue2HasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("DiscoverDynamicCardVerificationCode"))
+  if(jsonValue.ValueExists("CardHolderVerificationValue"))
   {
-    m_discoverDynamicCardVerificationCode = jsonValue.GetObject("DiscoverDynamicCardVerificationCode");
+    m_cardHolderVerificationValue = jsonValue.GetObject("CardHolderVerificationValue");
 
-    m_discoverDynamicCardVerificationCodeHasBeenSet = true;
+    m_cardHolderVerificationValueHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("DynamicCardVerificationCode"))
@@ -94,6 +87,13 @@ CardVerificationAttributes& CardVerificationAttributes::operator =(JsonView json
     m_dynamicCardVerificationValueHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("DiscoverDynamicCardVerificationCode"))
+  {
+    m_discoverDynamicCardVerificationCode = jsonValue.GetObject("DiscoverDynamicCardVerificationCode");
+
+    m_discoverDynamicCardVerificationCodeHasBeenSet = true;
+  }
+
   return *this;
 }
 
@@ -113,12 +113,6 @@ JsonValue CardVerificationAttributes::Jsonize() const
 
   }
 
-  if(m_cardHolderVerificationValueHasBeenSet)
-  {
-   payload.WithObject("CardHolderVerificationValue", m_cardHolderVerificationValue.Jsonize());
-
-  }
-
   if(m_cardVerificationValue1HasBeenSet)
   {
    payload.WithObject("CardVerificationValue1", m_cardVerificationValue1.Jsonize());
@@ -131,9 +125,9 @@ JsonValue CardVerificationAttributes::Jsonize() const
 
   }
 
-  if(m_discoverDynamicCardVerificationCodeHasBeenSet)
+  if(m_cardHolderVerificationValueHasBeenSet)
   {
-   payload.WithObject("DiscoverDynamicCardVerificationCode", m_discoverDynamicCardVerificationCode.Jsonize());
+   payload.WithObject("CardHolderVerificationValue", m_cardHolderVerificationValue.Jsonize());
 
   }
 
@@ -149,6 +143,12 @@ JsonValue CardVerificationAttributes::Jsonize() const
 
   }
 
+  if(m_discoverDynamicCardVerificationCodeHasBeenSet)
+  {
+   payload.WithObject("DiscoverDynamicCardVerificationCode", m_discoverDynamicCardVerificationCode.Jsonize());
+
+  }
+
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DecryptDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DecryptDataRequest.cpp
index e4a9ba18e55..ed2cb285d48 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DecryptDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DecryptDataRequest.cpp
@@ -13,9 +13,10 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 DecryptDataRequest::DecryptDataRequest() : 
+    m_keyIdentifierHasBeenSet(false),
     m_cipherTextHasBeenSet(false),
     m_decryptionAttributesHasBeenSet(false),
-    m_keyIdentifierHasBeenSet(false)
+    m_wrappedKeyHasBeenSet(false)
 {
 }
 
@@ -35,6 +36,12 @@ Aws::String DecryptDataRequest::SerializePayload() const
 
   }
 
+  if(m_wrappedKeyHasBeenSet)
+  {
+   payload.WithObject("WrappedKey", m_wrappedKey.Jsonize());
+
+  }
+
   return payload.View().WriteReadable();
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DiscoverDynamicCardVerificationCode.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DiscoverDynamicCardVerificationCode.cpp
index 62bdca84e57..83cf272dff2 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DiscoverDynamicCardVerificationCode.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DiscoverDynamicCardVerificationCode.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 DiscoverDynamicCardVerificationCode::DiscoverDynamicCardVerificationCode() : 
-    m_applicationTransactionCounterHasBeenSet(false),
     m_cardExpiryDateHasBeenSet(false),
-    m_unpredictableNumberHasBeenSet(false)
+    m_unpredictableNumberHasBeenSet(false),
+    m_applicationTransactionCounterHasBeenSet(false)
 {
 }
 
@@ -33,13 +33,6 @@ DiscoverDynamicCardVerificationCode::DiscoverDynamicCardVerificationCode(JsonVie
 
 DiscoverDynamicCardVerificationCode& DiscoverDynamicCardVerificationCode::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
-  {
-    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
-
-    m_applicationTransactionCounterHasBeenSet = true;
-  }
-
   if(jsonValue.ValueExists("CardExpiryDate"))
   {
     m_cardExpiryDate = jsonValue.GetString("CardExpiryDate");
@@ -54,6 +47,13 @@ DiscoverDynamicCardVerificationCode& DiscoverDynamicCardVerificationCode::operat
     m_unpredictableNumberHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
+  {
+    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
+
+    m_applicationTransactionCounterHasBeenSet = true;
+  }
+
   return *this;
 }
 
@@ -61,12 +61,6 @@ JsonValue DiscoverDynamicCardVerificationCode::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_applicationTransactionCounterHasBeenSet)
-  {
-   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
-
-  }
-
   if(m_cardExpiryDateHasBeenSet)
   {
    payload.WithString("CardExpiryDate", m_cardExpiryDate);
@@ -79,6 +73,12 @@ JsonValue DiscoverDynamicCardVerificationCode::Jsonize() const
 
   }
 
+  if(m_applicationTransactionCounterHasBeenSet)
+  {
+   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
+
+  }
+
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptAttributes.cpp
index f1adc8b7622..684f14bd8eb 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptAttributes.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 DukptAttributes::DukptAttributes() : 
+    m_keySerialNumberHasBeenSet(false),
     m_dukptDerivationType(DukptDerivationType::NOT_SET),
-    m_dukptDerivationTypeHasBeenSet(false),
-    m_keySerialNumberHasBeenSet(false)
+    m_dukptDerivationTypeHasBeenSet(false)
 {
 }
 
@@ -33,18 +33,18 @@ DukptAttributes::DukptAttributes(JsonView jsonValue)
 
 DukptAttributes& DukptAttributes::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("DukptDerivationType"))
+  if(jsonValue.ValueExists("KeySerialNumber"))
   {
-    m_dukptDerivationType = DukptDerivationTypeMapper::GetDukptDerivationTypeForName(jsonValue.GetString("DukptDerivationType"));
+    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
 
-    m_dukptDerivationTypeHasBeenSet = true;
+    m_keySerialNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("KeySerialNumber"))
+  if(jsonValue.ValueExists("DukptDerivationType"))
   {
-    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
+    m_dukptDerivationType = DukptDerivationTypeMapper::GetDukptDerivationTypeForName(jsonValue.GetString("DukptDerivationType"));
 
-    m_keySerialNumberHasBeenSet = true;
+    m_dukptDerivationTypeHasBeenSet = true;
   }
 
   return *this;
@@ -54,17 +54,17 @@ JsonValue DukptAttributes::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_dukptDerivationTypeHasBeenSet)
-  {
-   payload.WithString("DukptDerivationType", DukptDerivationTypeMapper::GetNameForDukptDerivationType(m_dukptDerivationType));
-  }
-
   if(m_keySerialNumberHasBeenSet)
   {
    payload.WithString("KeySerialNumber", m_keySerialNumber);
 
   }
 
+  if(m_dukptDerivationTypeHasBeenSet)
+  {
+   payload.WithString("DukptDerivationType", DukptDerivationTypeMapper::GetNameForDukptDerivationType(m_dukptDerivationType));
+  }
+
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptDerivationAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptDerivationAttributes.cpp
index ed9edec2230..f140372c3f2 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptDerivationAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptDerivationAttributes.cpp
@@ -19,11 +19,11 @@ namespace Model
 {
 
 DukptDerivationAttributes::DukptDerivationAttributes() : 
+    m_keySerialNumberHasBeenSet(false),
     m_dukptKeyDerivationType(DukptDerivationType::NOT_SET),
     m_dukptKeyDerivationTypeHasBeenSet(false),
     m_dukptKeyVariant(DukptKeyVariant::NOT_SET),
-    m_dukptKeyVariantHasBeenSet(false),
-    m_keySerialNumberHasBeenSet(false)
+    m_dukptKeyVariantHasBeenSet(false)
 {
 }
 
@@ -35,6 +35,13 @@ DukptDerivationAttributes::DukptDerivationAttributes(JsonView jsonValue)
 
 DukptDerivationAttributes& DukptDerivationAttributes::operator =(JsonView jsonValue)
 {
+  if(jsonValue.ValueExists("KeySerialNumber"))
+  {
+    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
+
+    m_keySerialNumberHasBeenSet = true;
+  }
+
   if(jsonValue.ValueExists("DukptKeyDerivationType"))
   {
     m_dukptKeyDerivationType = DukptDerivationTypeMapper::GetDukptDerivationTypeForName(jsonValue.GetString("DukptKeyDerivationType"));
@@ -49,13 +56,6 @@ DukptDerivationAttributes& DukptDerivationAttributes::operator =(JsonView jsonVa
     m_dukptKeyVariantHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("KeySerialNumber"))
-  {
-    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
-
-    m_keySerialNumberHasBeenSet = true;
-  }
-
   return *this;
 }
 
@@ -63,6 +63,12 @@ JsonValue DukptDerivationAttributes::Jsonize() const
 {
   JsonValue payload;
 
+  if(m_keySerialNumberHasBeenSet)
+  {
+   payload.WithString("KeySerialNumber", m_keySerialNumber);
+
+  }
+
   if(m_dukptKeyDerivationTypeHasBeenSet)
   {
    payload.WithString("DukptKeyDerivationType", DukptDerivationTypeMapper::GetNameForDukptDerivationType(m_dukptKeyDerivationType));
@@ -73,12 +79,6 @@ JsonValue DukptDerivationAttributes::Jsonize() const
    payload.WithString("DukptKeyVariant", DukptKeyVariantMapper::GetNameForDukptKeyVariant(m_dukptKeyVariant));
   }
 
-  if(m_keySerialNumberHasBeenSet)
-  {
-   payload.WithString("KeySerialNumber", m_keySerialNumber);
-
-  }
-
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptEncryptionAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptEncryptionAttributes.cpp
index cbb64c051f4..ca6eb712017 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptEncryptionAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DukptEncryptionAttributes.cpp
@@ -19,14 +19,14 @@ namespace Model
 {
 
 DukptEncryptionAttributes::DukptEncryptionAttributes() : 
+    m_keySerialNumberHasBeenSet(false),
+    m_mode(DukptEncryptionMode::NOT_SET),
+    m_modeHasBeenSet(false),
     m_dukptKeyDerivationType(DukptDerivationType::NOT_SET),
     m_dukptKeyDerivationTypeHasBeenSet(false),
     m_dukptKeyVariant(DukptKeyVariant::NOT_SET),
     m_dukptKeyVariantHasBeenSet(false),
-    m_initializationVectorHasBeenSet(false),
-    m_keySerialNumberHasBeenSet(false),
-    m_mode(DukptEncryptionMode::NOT_SET),
-    m_modeHasBeenSet(false)
+    m_initializationVectorHasBeenSet(false)
 {
 }
 
@@ -38,6 +38,20 @@ DukptEncryptionAttributes::DukptEncryptionAttributes(JsonView jsonValue)
 
 DukptEncryptionAttributes& DukptEncryptionAttributes::operator =(JsonView jsonValue)
 {
+  if(jsonValue.ValueExists("KeySerialNumber"))
+  {
+    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
+
+    m_keySerialNumberHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Mode"))
+  {
+    m_mode = DukptEncryptionModeMapper::GetDukptEncryptionModeForName(jsonValue.GetString("Mode"));
+
+    m_modeHasBeenSet = true;
+  }
+
   if(jsonValue.ValueExists("DukptKeyDerivationType"))
   {
     m_dukptKeyDerivationType = DukptDerivationTypeMapper::GetDukptDerivationTypeForName(jsonValue.GetString("DukptKeyDerivationType"));
@@ -59,20 +73,6 @@ DukptEncryptionAttributes& DukptEncryptionAttributes::operator =(JsonView jsonVa
     m_initializationVectorHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("KeySerialNumber"))
-  {
-    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
-
-    m_keySerialNumberHasBeenSet = true;
-  }
-
-  if(jsonValue.ValueExists("Mode"))
-  {
-    m_mode = DukptEncryptionModeMapper::GetDukptEncryptionModeForName(jsonValue.GetString("Mode"));
-
-    m_modeHasBeenSet = true;
-  }
-
   return *this;
 }
 
@@ -80,6 +80,17 @@ JsonValue DukptEncryptionAttributes::Jsonize() const
 {
   JsonValue payload;
 
+  if(m_keySerialNumberHasBeenSet)
+  {
+   payload.WithString("KeySerialNumber", m_keySerialNumber);
+
+  }
+
+  if(m_modeHasBeenSet)
+  {
+   payload.WithString("Mode", DukptEncryptionModeMapper::GetNameForDukptEncryptionMode(m_mode));
+  }
+
   if(m_dukptKeyDerivationTypeHasBeenSet)
   {
    payload.WithString("DukptKeyDerivationType", DukptDerivationTypeMapper::GetNameForDukptDerivationType(m_dukptKeyDerivationType));
@@ -96,17 +107,6 @@ JsonValue DukptEncryptionAttributes::Jsonize() const
 
   }
 
-  if(m_keySerialNumberHasBeenSet)
-  {
-   payload.WithString("KeySerialNumber", m_keySerialNumber);
-
-  }
-
-  if(m_modeHasBeenSet)
-  {
-   payload.WithString("Mode", DukptEncryptionModeMapper::GetNameForDukptEncryptionMode(m_mode));
-  }
-
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationCode.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationCode.cpp
index ac573df340f..85341c79802 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationCode.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationCode.cpp
@@ -19,10 +19,10 @@ namespace Model
 {
 
 DynamicCardVerificationCode::DynamicCardVerificationCode() : 
-    m_applicationTransactionCounterHasBeenSet(false),
+    m_unpredictableNumberHasBeenSet(false),
     m_panSequenceNumberHasBeenSet(false),
-    m_trackDataHasBeenSet(false),
-    m_unpredictableNumberHasBeenSet(false)
+    m_applicationTransactionCounterHasBeenSet(false),
+    m_trackDataHasBeenSet(false)
 {
 }
 
@@ -34,11 +34,11 @@ DynamicCardVerificationCode::DynamicCardVerificationCode(JsonView jsonValue)
 
 DynamicCardVerificationCode& DynamicCardVerificationCode::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
+  if(jsonValue.ValueExists("UnpredictableNumber"))
   {
-    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
+    m_unpredictableNumber = jsonValue.GetString("UnpredictableNumber");
 
-    m_applicationTransactionCounterHasBeenSet = true;
+    m_unpredictableNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PanSequenceNumber"))
@@ -48,18 +48,18 @@ DynamicCardVerificationCode& DynamicCardVerificationCode::operator =(JsonView js
     m_panSequenceNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("TrackData"))
+  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
   {
-    m_trackData = jsonValue.GetString("TrackData");
+    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
 
-    m_trackDataHasBeenSet = true;
+    m_applicationTransactionCounterHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("UnpredictableNumber"))
+  if(jsonValue.ValueExists("TrackData"))
   {
-    m_unpredictableNumber = jsonValue.GetString("UnpredictableNumber");
+    m_trackData = jsonValue.GetString("TrackData");
 
-    m_unpredictableNumberHasBeenSet = true;
+    m_trackDataHasBeenSet = true;
   }
 
   return *this;
@@ -69,9 +69,9 @@ JsonValue DynamicCardVerificationCode::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_applicationTransactionCounterHasBeenSet)
+  if(m_unpredictableNumberHasBeenSet)
   {
-   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
+   payload.WithString("UnpredictableNumber", m_unpredictableNumber);
 
   }
 
@@ -81,15 +81,15 @@ JsonValue DynamicCardVerificationCode::Jsonize() const
 
   }
 
-  if(m_trackDataHasBeenSet)
+  if(m_applicationTransactionCounterHasBeenSet)
   {
-   payload.WithString("TrackData", m_trackData);
+   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
 
   }
 
-  if(m_unpredictableNumberHasBeenSet)
+  if(m_trackDataHasBeenSet)
   {
-   payload.WithString("UnpredictableNumber", m_unpredictableNumber);
+   payload.WithString("TrackData", m_trackData);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationValue.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationValue.cpp
index c3da98c3a7b..42eb7620207 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationValue.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/DynamicCardVerificationValue.cpp
@@ -19,10 +19,10 @@ namespace Model
 {
 
 DynamicCardVerificationValue::DynamicCardVerificationValue() : 
-    m_applicationTransactionCounterHasBeenSet(false),
-    m_cardExpiryDateHasBeenSet(false),
     m_panSequenceNumberHasBeenSet(false),
-    m_serviceCodeHasBeenSet(false)
+    m_cardExpiryDateHasBeenSet(false),
+    m_serviceCodeHasBeenSet(false),
+    m_applicationTransactionCounterHasBeenSet(false)
 {
 }
 
@@ -34,11 +34,11 @@ DynamicCardVerificationValue::DynamicCardVerificationValue(JsonView jsonValue)
 
 DynamicCardVerificationValue& DynamicCardVerificationValue::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
+  if(jsonValue.ValueExists("PanSequenceNumber"))
   {
-    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
+    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
 
-    m_applicationTransactionCounterHasBeenSet = true;
+    m_panSequenceNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("CardExpiryDate"))
@@ -48,18 +48,18 @@ DynamicCardVerificationValue& DynamicCardVerificationValue::operator =(JsonView
     m_cardExpiryDateHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PanSequenceNumber"))
+  if(jsonValue.ValueExists("ServiceCode"))
   {
-    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
+    m_serviceCode = jsonValue.GetString("ServiceCode");
 
-    m_panSequenceNumberHasBeenSet = true;
+    m_serviceCodeHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("ServiceCode"))
+  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
   {
-    m_serviceCode = jsonValue.GetString("ServiceCode");
+    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
 
-    m_serviceCodeHasBeenSet = true;
+    m_applicationTransactionCounterHasBeenSet = true;
   }
 
   return *this;
@@ -69,9 +69,9 @@ JsonValue DynamicCardVerificationValue::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_applicationTransactionCounterHasBeenSet)
+  if(m_panSequenceNumberHasBeenSet)
   {
-   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
+   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
 
   }
 
@@ -81,15 +81,15 @@ JsonValue DynamicCardVerificationValue::Jsonize() const
 
   }
 
-  if(m_panSequenceNumberHasBeenSet)
+  if(m_serviceCodeHasBeenSet)
   {
-   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
+   payload.WithString("ServiceCode", m_serviceCode);
 
   }
 
-  if(m_serviceCodeHasBeenSet)
+  if(m_applicationTransactionCounterHasBeenSet)
   {
-   payload.WithString("ServiceCode", m_serviceCode);
+   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EmvEncryptionAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EmvEncryptionAttributes.cpp
index 1e053104d0a..a02a3f60f11 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EmvEncryptionAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EmvEncryptionAttributes.cpp
@@ -19,14 +19,14 @@ namespace Model
 {
 
 EmvEncryptionAttributes::EmvEncryptionAttributes() : 
-    m_initializationVectorHasBeenSet(false),
     m_majorKeyDerivationMode(EmvMajorKeyDerivationMode::NOT_SET),
     m_majorKeyDerivationModeHasBeenSet(false),
+    m_primaryAccountNumberHasBeenSet(false),
+    m_panSequenceNumberHasBeenSet(false),
+    m_sessionDerivationDataHasBeenSet(false),
     m_mode(EmvEncryptionMode::NOT_SET),
     m_modeHasBeenSet(false),
-    m_panSequenceNumberHasBeenSet(false),
-    m_primaryAccountNumberHasBeenSet(false),
-    m_sessionDerivationDataHasBeenSet(false)
+    m_initializationVectorHasBeenSet(false)
 {
 }
 
@@ -38,13 +38,6 @@ EmvEncryptionAttributes::EmvEncryptionAttributes(JsonView jsonValue)
 
 EmvEncryptionAttributes& EmvEncryptionAttributes::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("InitializationVector"))
-  {
-    m_initializationVector = jsonValue.GetString("InitializationVector");
-
-    m_initializationVectorHasBeenSet = true;
-  }
-
   if(jsonValue.ValueExists("MajorKeyDerivationMode"))
   {
     m_majorKeyDerivationMode = EmvMajorKeyDerivationModeMapper::GetEmvMajorKeyDerivationModeForName(jsonValue.GetString("MajorKeyDerivationMode"));
@@ -52,11 +45,11 @@ EmvEncryptionAttributes& EmvEncryptionAttributes::operator =(JsonView jsonValue)
     m_majorKeyDerivationModeHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Mode"))
+  if(jsonValue.ValueExists("PrimaryAccountNumber"))
   {
-    m_mode = EmvEncryptionModeMapper::GetEmvEncryptionModeForName(jsonValue.GetString("Mode"));
+    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
 
-    m_modeHasBeenSet = true;
+    m_primaryAccountNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PanSequenceNumber"))
@@ -66,18 +59,25 @@ EmvEncryptionAttributes& EmvEncryptionAttributes::operator =(JsonView jsonValue)
     m_panSequenceNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PrimaryAccountNumber"))
+  if(jsonValue.ValueExists("SessionDerivationData"))
   {
-    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
+    m_sessionDerivationData = jsonValue.GetString("SessionDerivationData");
 
-    m_primaryAccountNumberHasBeenSet = true;
+    m_sessionDerivationDataHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("SessionDerivationData"))
+  if(jsonValue.ValueExists("Mode"))
   {
-    m_sessionDerivationData = jsonValue.GetString("SessionDerivationData");
+    m_mode = EmvEncryptionModeMapper::GetEmvEncryptionModeForName(jsonValue.GetString("Mode"));
 
-    m_sessionDerivationDataHasBeenSet = true;
+    m_modeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("InitializationVector"))
+  {
+    m_initializationVector = jsonValue.GetString("InitializationVector");
+
+    m_initializationVectorHasBeenSet = true;
   }
 
   return *this;
@@ -87,20 +87,15 @@ JsonValue EmvEncryptionAttributes::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_initializationVectorHasBeenSet)
-  {
-   payload.WithString("InitializationVector", m_initializationVector);
-
-  }
-
   if(m_majorKeyDerivationModeHasBeenSet)
   {
    payload.WithString("MajorKeyDerivationMode", EmvMajorKeyDerivationModeMapper::GetNameForEmvMajorKeyDerivationMode(m_majorKeyDerivationMode));
   }
 
-  if(m_modeHasBeenSet)
+  if(m_primaryAccountNumberHasBeenSet)
   {
-   payload.WithString("Mode", EmvEncryptionModeMapper::GetNameForEmvEncryptionMode(m_mode));
+   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+
   }
 
   if(m_panSequenceNumberHasBeenSet)
@@ -109,15 +104,20 @@ JsonValue EmvEncryptionAttributes::Jsonize() const
 
   }
 
-  if(m_primaryAccountNumberHasBeenSet)
+  if(m_sessionDerivationDataHasBeenSet)
   {
-   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+   payload.WithString("SessionDerivationData", m_sessionDerivationData);
 
   }
 
-  if(m_sessionDerivationDataHasBeenSet)
+  if(m_modeHasBeenSet)
   {
-   payload.WithString("SessionDerivationData", m_sessionDerivationData);
+   payload.WithString("Mode", EmvEncryptionModeMapper::GetNameForEmvEncryptionMode(m_mode));
+  }
+
+  if(m_initializationVectorHasBeenSet)
+  {
+   payload.WithString("InitializationVector", m_initializationVector);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataRequest.cpp
index 41f0b8e5104..d92e0935d71 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataRequest.cpp
@@ -13,9 +13,10 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 EncryptDataRequest::EncryptDataRequest() : 
-    m_encryptionAttributesHasBeenSet(false),
     m_keyIdentifierHasBeenSet(false),
-    m_plainTextHasBeenSet(false)
+    m_plainTextHasBeenSet(false),
+    m_encryptionAttributesHasBeenSet(false),
+    m_wrappedKeyHasBeenSet(false)
 {
 }
 
@@ -23,15 +24,21 @@ Aws::String EncryptDataRequest::SerializePayload() const
 {
   JsonValue payload;
 
+  if(m_plainTextHasBeenSet)
+  {
+   payload.WithString("PlainText", m_plainText);
+
+  }
+
   if(m_encryptionAttributesHasBeenSet)
   {
    payload.WithObject("EncryptionAttributes", m_encryptionAttributes.Jsonize());
 
   }
 
-  if(m_plainTextHasBeenSet)
+  if(m_wrappedKeyHasBeenSet)
   {
-   payload.WithString("PlainText", m_plainText);
+   payload.WithObject("WrappedKey", m_wrappedKey.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataResult.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataResult.cpp
index 9bc2a21baae..07036673ac4 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataResult.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptDataResult.cpp
@@ -29,12 +29,6 @@ EncryptDataResult::EncryptDataResult(const Aws::AmazonWebServiceResult<JsonValue
 EncryptDataResult& EncryptDataResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
 {
   JsonView jsonValue = result.GetPayload().View();
-  if(jsonValue.ValueExists("CipherText"))
-  {
-    m_cipherText = jsonValue.GetString("CipherText");
-
-  }
-
   if(jsonValue.ValueExists("KeyArn"))
   {
     m_keyArn = jsonValue.GetString("KeyArn");
@@ -47,6 +41,12 @@ EncryptDataResult& EncryptDataResult::operator =(const Aws::AmazonWebServiceResu
 
   }
 
+  if(jsonValue.ValueExists("CipherText"))
+  {
+    m_cipherText = jsonValue.GetString("CipherText");
+
+  }
+
 
   const auto& headers = result.GetHeaderValueCollection();
   const auto& requestIdIter = headers.find("x-amzn-requestid");
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptionDecryptionAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptionDecryptionAttributes.cpp
index 070fa517534..da48111e915 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptionDecryptionAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/EncryptionDecryptionAttributes.cpp
@@ -19,10 +19,10 @@ namespace Model
 {
 
 EncryptionDecryptionAttributes::EncryptionDecryptionAttributes() : 
+    m_symmetricHasBeenSet(false),
     m_asymmetricHasBeenSet(false),
     m_dukptHasBeenSet(false),
-    m_emvHasBeenSet(false),
-    m_symmetricHasBeenSet(false)
+    m_emvHasBeenSet(false)
 {
 }
 
@@ -34,6 +34,13 @@ EncryptionDecryptionAttributes::EncryptionDecryptionAttributes(JsonView jsonValu
 
 EncryptionDecryptionAttributes& EncryptionDecryptionAttributes::operator =(JsonView jsonValue)
 {
+  if(jsonValue.ValueExists("Symmetric"))
+  {
+    m_symmetric = jsonValue.GetObject("Symmetric");
+
+    m_symmetricHasBeenSet = true;
+  }
+
   if(jsonValue.ValueExists("Asymmetric"))
   {
     m_asymmetric = jsonValue.GetObject("Asymmetric");
@@ -55,13 +62,6 @@ EncryptionDecryptionAttributes& EncryptionDecryptionAttributes::operator =(JsonV
     m_emvHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Symmetric"))
-  {
-    m_symmetric = jsonValue.GetObject("Symmetric");
-
-    m_symmetricHasBeenSet = true;
-  }
-
   return *this;
 }
 
@@ -69,6 +69,12 @@ JsonValue EncryptionDecryptionAttributes::Jsonize() const
 {
   JsonValue payload;
 
+  if(m_symmetricHasBeenSet)
+  {
+   payload.WithObject("Symmetric", m_symmetric.Jsonize());
+
+  }
+
   if(m_asymmetricHasBeenSet)
   {
    payload.WithObject("Asymmetric", m_asymmetric.Jsonize());
@@ -87,12 +93,6 @@ JsonValue EncryptionDecryptionAttributes::Jsonize() const
 
   }
 
-  if(m_symmetricHasBeenSet)
-  {
-   payload.WithObject("Symmetric", m_symmetric.Jsonize());
-
-  }
-
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateCardValidationDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateCardValidationDataRequest.cpp
index 5fb4cff6635..3a4b3cba6e8 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateCardValidationDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateCardValidationDataRequest.cpp
@@ -13,9 +13,9 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 GenerateCardValidationDataRequest::GenerateCardValidationDataRequest() : 
-    m_generationAttributesHasBeenSet(false),
     m_keyIdentifierHasBeenSet(false),
     m_primaryAccountNumberHasBeenSet(false),
+    m_generationAttributesHasBeenSet(false),
     m_validationDataLength(0),
     m_validationDataLengthHasBeenSet(false)
 {
@@ -25,12 +25,6 @@ Aws::String GenerateCardValidationDataRequest::SerializePayload() const
 {
   JsonValue payload;
 
-  if(m_generationAttributesHasBeenSet)
-  {
-   payload.WithObject("GenerationAttributes", m_generationAttributes.Jsonize());
-
-  }
-
   if(m_keyIdentifierHasBeenSet)
   {
    payload.WithString("KeyIdentifier", m_keyIdentifier);
@@ -43,6 +37,12 @@ Aws::String GenerateCardValidationDataRequest::SerializePayload() const
 
   }
 
+  if(m_generationAttributesHasBeenSet)
+  {
+   payload.WithObject("GenerationAttributes", m_generationAttributes.Jsonize());
+
+  }
+
   if(m_validationDataLengthHasBeenSet)
   {
    payload.WithInteger("ValidationDataLength", m_validationDataLength);
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateMacRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateMacRequest.cpp
index 9b086ab994f..c7c88fa7e88 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateMacRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GenerateMacRequest.cpp
@@ -13,11 +13,11 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 GenerateMacRequest::GenerateMacRequest() : 
-    m_generationAttributesHasBeenSet(false),
     m_keyIdentifierHasBeenSet(false),
+    m_messageDataHasBeenSet(false),
+    m_generationAttributesHasBeenSet(false),
     m_macLength(0),
-    m_macLengthHasBeenSet(false),
-    m_messageDataHasBeenSet(false)
+    m_macLengthHasBeenSet(false)
 {
 }
 
@@ -25,27 +25,27 @@ Aws::String GenerateMacRequest::SerializePayload() const
 {
   JsonValue payload;
 
-  if(m_generationAttributesHasBeenSet)
+  if(m_keyIdentifierHasBeenSet)
   {
-   payload.WithObject("GenerationAttributes", m_generationAttributes.Jsonize());
+   payload.WithString("KeyIdentifier", m_keyIdentifier);
 
   }
 
-  if(m_keyIdentifierHasBeenSet)
+  if(m_messageDataHasBeenSet)
   {
-   payload.WithString("KeyIdentifier", m_keyIdentifier);
+   payload.WithString("MessageData", m_messageData);
 
   }
 
-  if(m_macLengthHasBeenSet)
+  if(m_generationAttributesHasBeenSet)
   {
-   payload.WithInteger("MacLength", m_macLength);
+   payload.WithObject("GenerationAttributes", m_generationAttributes.Jsonize());
 
   }
 
-  if(m_messageDataHasBeenSet)
+  if(m_macLengthHasBeenSet)
   {
-   payload.WithString("MessageData", m_messageData);
+   payload.WithInteger("MacLength", m_macLength);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataRequest.cpp
index ae16ee6b7ab..a85502a9874 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataRequest.cpp
@@ -13,14 +13,14 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 GeneratePinDataRequest::GeneratePinDataRequest() : 
+    m_generationKeyIdentifierHasBeenSet(false),
     m_encryptionKeyIdentifierHasBeenSet(false),
     m_generationAttributesHasBeenSet(false),
-    m_generationKeyIdentifierHasBeenSet(false),
-    m_pinBlockFormat(PinBlockFormatForPinData::NOT_SET),
-    m_pinBlockFormatHasBeenSet(false),
     m_pinDataLength(0),
     m_pinDataLengthHasBeenSet(false),
-    m_primaryAccountNumberHasBeenSet(false)
+    m_primaryAccountNumberHasBeenSet(false),
+    m_pinBlockFormat(PinBlockFormatForPinData::NOT_SET),
+    m_pinBlockFormatHasBeenSet(false)
 {
 }
 
@@ -28,29 +28,24 @@ Aws::String GeneratePinDataRequest::SerializePayload() const
 {
   JsonValue payload;
 
-  if(m_encryptionKeyIdentifierHasBeenSet)
+  if(m_generationKeyIdentifierHasBeenSet)
   {
-   payload.WithString("EncryptionKeyIdentifier", m_encryptionKeyIdentifier);
+   payload.WithString("GenerationKeyIdentifier", m_generationKeyIdentifier);
 
   }
 
-  if(m_generationAttributesHasBeenSet)
+  if(m_encryptionKeyIdentifierHasBeenSet)
   {
-   payload.WithObject("GenerationAttributes", m_generationAttributes.Jsonize());
+   payload.WithString("EncryptionKeyIdentifier", m_encryptionKeyIdentifier);
 
   }
 
-  if(m_generationKeyIdentifierHasBeenSet)
+  if(m_generationAttributesHasBeenSet)
   {
-   payload.WithString("GenerationKeyIdentifier", m_generationKeyIdentifier);
+   payload.WithObject("GenerationAttributes", m_generationAttributes.Jsonize());
 
   }
 
-  if(m_pinBlockFormatHasBeenSet)
-  {
-   payload.WithString("PinBlockFormat", PinBlockFormatForPinDataMapper::GetNameForPinBlockFormatForPinData(m_pinBlockFormat));
-  }
-
   if(m_pinDataLengthHasBeenSet)
   {
    payload.WithInteger("PinDataLength", m_pinDataLength);
@@ -63,6 +58,11 @@ Aws::String GeneratePinDataRequest::SerializePayload() const
 
   }
 
+  if(m_pinBlockFormatHasBeenSet)
+  {
+   payload.WithString("PinBlockFormat", PinBlockFormatForPinDataMapper::GetNameForPinBlockFormatForPinData(m_pinBlockFormat));
+  }
+
   return payload.View().WriteReadable();
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataResult.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataResult.cpp
index aaf2e00ca8b..22d4aa4c0b8 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataResult.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/GeneratePinDataResult.cpp
@@ -29,33 +29,33 @@ GeneratePinDataResult::GeneratePinDataResult(const Aws::AmazonWebServiceResult<J
 GeneratePinDataResult& GeneratePinDataResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
 {
   JsonView jsonValue = result.GetPayload().View();
-  if(jsonValue.ValueExists("EncryptedPinBlock"))
+  if(jsonValue.ValueExists("GenerationKeyArn"))
   {
-    m_encryptedPinBlock = jsonValue.GetString("EncryptedPinBlock");
+    m_generationKeyArn = jsonValue.GetString("GenerationKeyArn");
 
   }
 
-  if(jsonValue.ValueExists("EncryptionKeyArn"))
+  if(jsonValue.ValueExists("GenerationKeyCheckValue"))
   {
-    m_encryptionKeyArn = jsonValue.GetString("EncryptionKeyArn");
+    m_generationKeyCheckValue = jsonValue.GetString("GenerationKeyCheckValue");
 
   }
 
-  if(jsonValue.ValueExists("EncryptionKeyCheckValue"))
+  if(jsonValue.ValueExists("EncryptionKeyArn"))
   {
-    m_encryptionKeyCheckValue = jsonValue.GetString("EncryptionKeyCheckValue");
+    m_encryptionKeyArn = jsonValue.GetString("EncryptionKeyArn");
 
   }
 
-  if(jsonValue.ValueExists("GenerationKeyArn"))
+  if(jsonValue.ValueExists("EncryptionKeyCheckValue"))
   {
-    m_generationKeyArn = jsonValue.GetString("GenerationKeyArn");
+    m_encryptionKeyCheckValue = jsonValue.GetString("EncryptionKeyCheckValue");
 
   }
 
-  if(jsonValue.ValueExists("GenerationKeyCheckValue"))
+  if(jsonValue.ValueExists("EncryptedPinBlock"))
   {
-    m_generationKeyCheckValue = jsonValue.GetString("GenerationKeyCheckValue");
+    m_encryptedPinBlock = jsonValue.GetString("EncryptedPinBlock");
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624NaturalPin.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624NaturalPin.cpp
index 20d17c9a22c..6186c5ede40 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624NaturalPin.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624NaturalPin.cpp
@@ -20,8 +20,8 @@ namespace Model
 
 Ibm3624NaturalPin::Ibm3624NaturalPin() : 
     m_decimalizationTableHasBeenSet(false),
-    m_pinValidationDataHasBeenSet(false),
-    m_pinValidationDataPadCharacterHasBeenSet(false)
+    m_pinValidationDataPadCharacterHasBeenSet(false),
+    m_pinValidationDataHasBeenSet(false)
 {
 }
 
@@ -40,18 +40,18 @@ Ibm3624NaturalPin& Ibm3624NaturalPin::operator =(JsonView jsonValue)
     m_decimalizationTableHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinValidationData"))
+  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
   {
-    m_pinValidationData = jsonValue.GetString("PinValidationData");
+    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
 
-    m_pinValidationDataHasBeenSet = true;
+    m_pinValidationDataPadCharacterHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
+  if(jsonValue.ValueExists("PinValidationData"))
   {
-    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
+    m_pinValidationData = jsonValue.GetString("PinValidationData");
 
-    m_pinValidationDataPadCharacterHasBeenSet = true;
+    m_pinValidationDataHasBeenSet = true;
   }
 
   return *this;
@@ -67,15 +67,15 @@ JsonValue Ibm3624NaturalPin::Jsonize() const
 
   }
 
-  if(m_pinValidationDataHasBeenSet)
+  if(m_pinValidationDataPadCharacterHasBeenSet)
   {
-   payload.WithString("PinValidationData", m_pinValidationData);
+   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
 
   }
 
-  if(m_pinValidationDataPadCharacterHasBeenSet)
+  if(m_pinValidationDataHasBeenSet)
   {
-   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
+   payload.WithString("PinValidationData", m_pinValidationData);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinFromOffset.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinFromOffset.cpp
index 6b7abc25ffd..538703b9aea 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinFromOffset.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinFromOffset.cpp
@@ -20,9 +20,9 @@ namespace Model
 
 Ibm3624PinFromOffset::Ibm3624PinFromOffset() : 
     m_decimalizationTableHasBeenSet(false),
-    m_pinOffsetHasBeenSet(false),
+    m_pinValidationDataPadCharacterHasBeenSet(false),
     m_pinValidationDataHasBeenSet(false),
-    m_pinValidationDataPadCharacterHasBeenSet(false)
+    m_pinOffsetHasBeenSet(false)
 {
 }
 
@@ -41,11 +41,11 @@ Ibm3624PinFromOffset& Ibm3624PinFromOffset::operator =(JsonView jsonValue)
     m_decimalizationTableHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinOffset"))
+  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
   {
-    m_pinOffset = jsonValue.GetString("PinOffset");
+    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
 
-    m_pinOffsetHasBeenSet = true;
+    m_pinValidationDataPadCharacterHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PinValidationData"))
@@ -55,11 +55,11 @@ Ibm3624PinFromOffset& Ibm3624PinFromOffset::operator =(JsonView jsonValue)
     m_pinValidationDataHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
+  if(jsonValue.ValueExists("PinOffset"))
   {
-    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
+    m_pinOffset = jsonValue.GetString("PinOffset");
 
-    m_pinValidationDataPadCharacterHasBeenSet = true;
+    m_pinOffsetHasBeenSet = true;
   }
 
   return *this;
@@ -75,9 +75,9 @@ JsonValue Ibm3624PinFromOffset::Jsonize() const
 
   }
 
-  if(m_pinOffsetHasBeenSet)
+  if(m_pinValidationDataPadCharacterHasBeenSet)
   {
-   payload.WithString("PinOffset", m_pinOffset);
+   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
 
   }
 
@@ -87,9 +87,9 @@ JsonValue Ibm3624PinFromOffset::Jsonize() const
 
   }
 
-  if(m_pinValidationDataPadCharacterHasBeenSet)
+  if(m_pinOffsetHasBeenSet)
   {
-   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
+   payload.WithString("PinOffset", m_pinOffset);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinOffset.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinOffset.cpp
index edfc05d2ad9..7d4765a6882 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinOffset.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinOffset.cpp
@@ -19,10 +19,10 @@ namespace Model
 {
 
 Ibm3624PinOffset::Ibm3624PinOffset() : 
-    m_decimalizationTableHasBeenSet(false),
     m_encryptedPinBlockHasBeenSet(false),
-    m_pinValidationDataHasBeenSet(false),
-    m_pinValidationDataPadCharacterHasBeenSet(false)
+    m_decimalizationTableHasBeenSet(false),
+    m_pinValidationDataPadCharacterHasBeenSet(false),
+    m_pinValidationDataHasBeenSet(false)
 {
 }
 
@@ -34,13 +34,6 @@ Ibm3624PinOffset::Ibm3624PinOffset(JsonView jsonValue)
 
 Ibm3624PinOffset& Ibm3624PinOffset::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("DecimalizationTable"))
-  {
-    m_decimalizationTable = jsonValue.GetString("DecimalizationTable");
-
-    m_decimalizationTableHasBeenSet = true;
-  }
-
   if(jsonValue.ValueExists("EncryptedPinBlock"))
   {
     m_encryptedPinBlock = jsonValue.GetString("EncryptedPinBlock");
@@ -48,11 +41,11 @@ Ibm3624PinOffset& Ibm3624PinOffset::operator =(JsonView jsonValue)
     m_encryptedPinBlockHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinValidationData"))
+  if(jsonValue.ValueExists("DecimalizationTable"))
   {
-    m_pinValidationData = jsonValue.GetString("PinValidationData");
+    m_decimalizationTable = jsonValue.GetString("DecimalizationTable");
 
-    m_pinValidationDataHasBeenSet = true;
+    m_decimalizationTableHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
@@ -62,6 +55,13 @@ Ibm3624PinOffset& Ibm3624PinOffset::operator =(JsonView jsonValue)
     m_pinValidationDataPadCharacterHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("PinValidationData"))
+  {
+    m_pinValidationData = jsonValue.GetString("PinValidationData");
+
+    m_pinValidationDataHasBeenSet = true;
+  }
+
   return *this;
 }
 
@@ -69,21 +69,15 @@ JsonValue Ibm3624PinOffset::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_decimalizationTableHasBeenSet)
-  {
-   payload.WithString("DecimalizationTable", m_decimalizationTable);
-
-  }
-
   if(m_encryptedPinBlockHasBeenSet)
   {
    payload.WithString("EncryptedPinBlock", m_encryptedPinBlock);
 
   }
 
-  if(m_pinValidationDataHasBeenSet)
+  if(m_decimalizationTableHasBeenSet)
   {
-   payload.WithString("PinValidationData", m_pinValidationData);
+   payload.WithString("DecimalizationTable", m_decimalizationTable);
 
   }
 
@@ -93,6 +87,12 @@ JsonValue Ibm3624PinOffset::Jsonize() const
 
   }
 
+  if(m_pinValidationDataHasBeenSet)
+  {
+   payload.WithString("PinValidationData", m_pinValidationData);
+
+  }
+
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinVerification.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinVerification.cpp
index 5177c859b1e..5a4ed861bcd 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinVerification.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624PinVerification.cpp
@@ -20,9 +20,9 @@ namespace Model
 
 Ibm3624PinVerification::Ibm3624PinVerification() : 
     m_decimalizationTableHasBeenSet(false),
-    m_pinOffsetHasBeenSet(false),
+    m_pinValidationDataPadCharacterHasBeenSet(false),
     m_pinValidationDataHasBeenSet(false),
-    m_pinValidationDataPadCharacterHasBeenSet(false)
+    m_pinOffsetHasBeenSet(false)
 {
 }
 
@@ -41,11 +41,11 @@ Ibm3624PinVerification& Ibm3624PinVerification::operator =(JsonView jsonValue)
     m_decimalizationTableHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinOffset"))
+  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
   {
-    m_pinOffset = jsonValue.GetString("PinOffset");
+    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
 
-    m_pinOffsetHasBeenSet = true;
+    m_pinValidationDataPadCharacterHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PinValidationData"))
@@ -55,11 +55,11 @@ Ibm3624PinVerification& Ibm3624PinVerification::operator =(JsonView jsonValue)
     m_pinValidationDataHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
+  if(jsonValue.ValueExists("PinOffset"))
   {
-    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
+    m_pinOffset = jsonValue.GetString("PinOffset");
 
-    m_pinValidationDataPadCharacterHasBeenSet = true;
+    m_pinOffsetHasBeenSet = true;
   }
 
   return *this;
@@ -75,9 +75,9 @@ JsonValue Ibm3624PinVerification::Jsonize() const
 
   }
 
-  if(m_pinOffsetHasBeenSet)
+  if(m_pinValidationDataPadCharacterHasBeenSet)
   {
-   payload.WithString("PinOffset", m_pinOffset);
+   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
 
   }
 
@@ -87,9 +87,9 @@ JsonValue Ibm3624PinVerification::Jsonize() const
 
   }
 
-  if(m_pinValidationDataPadCharacterHasBeenSet)
+  if(m_pinOffsetHasBeenSet)
   {
-   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
+   payload.WithString("PinOffset", m_pinOffset);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624RandomPin.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624RandomPin.cpp
index 19045fe59cd..2ecd0d0adb4 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624RandomPin.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/Ibm3624RandomPin.cpp
@@ -20,8 +20,8 @@ namespace Model
 
 Ibm3624RandomPin::Ibm3624RandomPin() : 
     m_decimalizationTableHasBeenSet(false),
-    m_pinValidationDataHasBeenSet(false),
-    m_pinValidationDataPadCharacterHasBeenSet(false)
+    m_pinValidationDataPadCharacterHasBeenSet(false),
+    m_pinValidationDataHasBeenSet(false)
 {
 }
 
@@ -40,18 +40,18 @@ Ibm3624RandomPin& Ibm3624RandomPin::operator =(JsonView jsonValue)
     m_decimalizationTableHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinValidationData"))
+  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
   {
-    m_pinValidationData = jsonValue.GetString("PinValidationData");
+    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
 
-    m_pinValidationDataHasBeenSet = true;
+    m_pinValidationDataPadCharacterHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PinValidationDataPadCharacter"))
+  if(jsonValue.ValueExists("PinValidationData"))
   {
-    m_pinValidationDataPadCharacter = jsonValue.GetString("PinValidationDataPadCharacter");
+    m_pinValidationData = jsonValue.GetString("PinValidationData");
 
-    m_pinValidationDataPadCharacterHasBeenSet = true;
+    m_pinValidationDataHasBeenSet = true;
   }
 
   return *this;
@@ -67,15 +67,15 @@ JsonValue Ibm3624RandomPin::Jsonize() const
 
   }
 
-  if(m_pinValidationDataHasBeenSet)
+  if(m_pinValidationDataPadCharacterHasBeenSet)
   {
-   payload.WithString("PinValidationData", m_pinValidationData);
+   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
 
   }
 
-  if(m_pinValidationDataPadCharacterHasBeenSet)
+  if(m_pinValidationDataHasBeenSet)
   {
-   payload.WithString("PinValidationDataPadCharacter", m_pinValidationDataPadCharacter);
+   payload.WithString("PinValidationData", m_pinValidationData);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/KeyCheckValueAlgorithm.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/KeyCheckValueAlgorithm.cpp
new file mode 100644
index 00000000000..63eb28fed7e
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/KeyCheckValueAlgorithm.cpp
@@ -0,0 +1,72 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/payment-cryptography-data/model/KeyCheckValueAlgorithm.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace PaymentCryptographyData
+  {
+    namespace Model
+    {
+      namespace KeyCheckValueAlgorithmMapper
+      {
+
+        static const int CMAC_HASH = HashingUtils::HashString("CMAC");
+        static const int ANSI_X9_24_HASH = HashingUtils::HashString("ANSI_X9_24");
+
+
+        KeyCheckValueAlgorithm GetKeyCheckValueAlgorithmForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == CMAC_HASH)
+          {
+            return KeyCheckValueAlgorithm::CMAC;
+          }
+          else if (hashCode == ANSI_X9_24_HASH)
+          {
+            return KeyCheckValueAlgorithm::ANSI_X9_24;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<KeyCheckValueAlgorithm>(hashCode);
+          }
+
+          return KeyCheckValueAlgorithm::NOT_SET;
+        }
+
+        Aws::String GetNameForKeyCheckValueAlgorithm(KeyCheckValueAlgorithm enumValue)
+        {
+          switch(enumValue)
+          {
+          case KeyCheckValueAlgorithm::NOT_SET:
+            return {};
+          case KeyCheckValueAlgorithm::CMAC:
+            return "CMAC";
+          case KeyCheckValueAlgorithm::ANSI_X9_24:
+            return "ANSI_X9_24";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace KeyCheckValueAlgorithmMapper
+    } // namespace Model
+  } // namespace PaymentCryptographyData
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmDukpt.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmDukpt.cpp
index faf35f39670..41c0f549ba2 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmDukpt.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmDukpt.cpp
@@ -19,11 +19,11 @@ namespace Model
 {
 
 MacAlgorithmDukpt::MacAlgorithmDukpt() : 
-    m_dukptDerivationType(DukptDerivationType::NOT_SET),
-    m_dukptDerivationTypeHasBeenSet(false),
+    m_keySerialNumberHasBeenSet(false),
     m_dukptKeyVariant(DukptKeyVariant::NOT_SET),
     m_dukptKeyVariantHasBeenSet(false),
-    m_keySerialNumberHasBeenSet(false)
+    m_dukptDerivationType(DukptDerivationType::NOT_SET),
+    m_dukptDerivationTypeHasBeenSet(false)
 {
 }
 
@@ -35,11 +35,11 @@ MacAlgorithmDukpt::MacAlgorithmDukpt(JsonView jsonValue)
 
 MacAlgorithmDukpt& MacAlgorithmDukpt::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("DukptDerivationType"))
+  if(jsonValue.ValueExists("KeySerialNumber"))
   {
-    m_dukptDerivationType = DukptDerivationTypeMapper::GetDukptDerivationTypeForName(jsonValue.GetString("DukptDerivationType"));
+    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
 
-    m_dukptDerivationTypeHasBeenSet = true;
+    m_keySerialNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("DukptKeyVariant"))
@@ -49,11 +49,11 @@ MacAlgorithmDukpt& MacAlgorithmDukpt::operator =(JsonView jsonValue)
     m_dukptKeyVariantHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("KeySerialNumber"))
+  if(jsonValue.ValueExists("DukptDerivationType"))
   {
-    m_keySerialNumber = jsonValue.GetString("KeySerialNumber");
+    m_dukptDerivationType = DukptDerivationTypeMapper::GetDukptDerivationTypeForName(jsonValue.GetString("DukptDerivationType"));
 
-    m_keySerialNumberHasBeenSet = true;
+    m_dukptDerivationTypeHasBeenSet = true;
   }
 
   return *this;
@@ -63,9 +63,10 @@ JsonValue MacAlgorithmDukpt::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_dukptDerivationTypeHasBeenSet)
+  if(m_keySerialNumberHasBeenSet)
   {
-   payload.WithString("DukptDerivationType", DukptDerivationTypeMapper::GetNameForDukptDerivationType(m_dukptDerivationType));
+   payload.WithString("KeySerialNumber", m_keySerialNumber);
+
   }
 
   if(m_dukptKeyVariantHasBeenSet)
@@ -73,10 +74,9 @@ JsonValue MacAlgorithmDukpt::Jsonize() const
    payload.WithString("DukptKeyVariant", DukptKeyVariantMapper::GetNameForDukptKeyVariant(m_dukptKeyVariant));
   }
 
-  if(m_keySerialNumberHasBeenSet)
+  if(m_dukptDerivationTypeHasBeenSet)
   {
-   payload.WithString("KeySerialNumber", m_keySerialNumber);
-
+   payload.WithString("DukptDerivationType", DukptDerivationTypeMapper::GetNameForDukptDerivationType(m_dukptDerivationType));
   }
 
   return payload;
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmEmv.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmEmv.cpp
index 9e9e5cb328e..1207a3f6cae 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmEmv.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAlgorithmEmv.cpp
@@ -21,8 +21,8 @@ namespace Model
 MacAlgorithmEmv::MacAlgorithmEmv() : 
     m_majorKeyDerivationMode(MajorKeyDerivationMode::NOT_SET),
     m_majorKeyDerivationModeHasBeenSet(false),
-    m_panSequenceNumberHasBeenSet(false),
     m_primaryAccountNumberHasBeenSet(false),
+    m_panSequenceNumberHasBeenSet(false),
     m_sessionKeyDerivationMode(SessionKeyDerivationMode::NOT_SET),
     m_sessionKeyDerivationModeHasBeenSet(false),
     m_sessionKeyDerivationValueHasBeenSet(false)
@@ -44,18 +44,18 @@ MacAlgorithmEmv& MacAlgorithmEmv::operator =(JsonView jsonValue)
     m_majorKeyDerivationModeHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PanSequenceNumber"))
+  if(jsonValue.ValueExists("PrimaryAccountNumber"))
   {
-    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
+    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
 
-    m_panSequenceNumberHasBeenSet = true;
+    m_primaryAccountNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PrimaryAccountNumber"))
+  if(jsonValue.ValueExists("PanSequenceNumber"))
   {
-    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
+    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
 
-    m_primaryAccountNumberHasBeenSet = true;
+    m_panSequenceNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("SessionKeyDerivationMode"))
@@ -84,15 +84,15 @@ JsonValue MacAlgorithmEmv::Jsonize() const
    payload.WithString("MajorKeyDerivationMode", MajorKeyDerivationModeMapper::GetNameForMajorKeyDerivationMode(m_majorKeyDerivationMode));
   }
 
-  if(m_panSequenceNumberHasBeenSet)
+  if(m_primaryAccountNumberHasBeenSet)
   {
-   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
+   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
 
   }
 
-  if(m_primaryAccountNumberHasBeenSet)
+  if(m_panSequenceNumberHasBeenSet)
   {
-   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAttributes.cpp
index 4110c581772..83edf3b214c 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/MacAttributes.cpp
@@ -21,10 +21,10 @@ namespace Model
 MacAttributes::MacAttributes() : 
     m_algorithm(MacAlgorithm::NOT_SET),
     m_algorithmHasBeenSet(false),
-    m_dukptCmacHasBeenSet(false),
+    m_emvMacHasBeenSet(false),
     m_dukptIso9797Algorithm1HasBeenSet(false),
     m_dukptIso9797Algorithm3HasBeenSet(false),
-    m_emvMacHasBeenSet(false)
+    m_dukptCmacHasBeenSet(false)
 {
 }
 
@@ -43,11 +43,11 @@ MacAttributes& MacAttributes::operator =(JsonView jsonValue)
     m_algorithmHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("DukptCmac"))
+  if(jsonValue.ValueExists("EmvMac"))
   {
-    m_dukptCmac = jsonValue.GetObject("DukptCmac");
+    m_emvMac = jsonValue.GetObject("EmvMac");
 
-    m_dukptCmacHasBeenSet = true;
+    m_emvMacHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("DukptIso9797Algorithm1"))
@@ -64,11 +64,11 @@ MacAttributes& MacAttributes::operator =(JsonView jsonValue)
     m_dukptIso9797Algorithm3HasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("EmvMac"))
+  if(jsonValue.ValueExists("DukptCmac"))
   {
-    m_emvMac = jsonValue.GetObject("EmvMac");
+    m_dukptCmac = jsonValue.GetObject("DukptCmac");
 
-    m_emvMacHasBeenSet = true;
+    m_dukptCmacHasBeenSet = true;
   }
 
   return *this;
@@ -83,9 +83,9 @@ JsonValue MacAttributes::Jsonize() const
    payload.WithString("Algorithm", MacAlgorithmMapper::GetNameForMacAlgorithm(m_algorithm));
   }
 
-  if(m_dukptCmacHasBeenSet)
+  if(m_emvMacHasBeenSet)
   {
-   payload.WithObject("DukptCmac", m_dukptCmac.Jsonize());
+   payload.WithObject("EmvMac", m_emvMac.Jsonize());
 
   }
 
@@ -101,9 +101,9 @@ JsonValue MacAttributes::Jsonize() const
 
   }
 
-  if(m_emvMacHasBeenSet)
+  if(m_dukptCmacHasBeenSet)
   {
-   payload.WithObject("EmvMac", m_emvMac.Jsonize());
+   payload.WithObject("DukptCmac", m_dukptCmac.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinGenerationAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinGenerationAttributes.cpp
index 1cd9c497011..0b9268b16cd 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinGenerationAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinGenerationAttributes.cpp
@@ -19,12 +19,12 @@ namespace Model
 {
 
 PinGenerationAttributes::PinGenerationAttributes() : 
-    m_ibm3624NaturalPinHasBeenSet(false),
-    m_ibm3624PinFromOffsetHasBeenSet(false),
+    m_visaPinHasBeenSet(false),
+    m_visaPinVerificationValueHasBeenSet(false),
     m_ibm3624PinOffsetHasBeenSet(false),
+    m_ibm3624NaturalPinHasBeenSet(false),
     m_ibm3624RandomPinHasBeenSet(false),
-    m_visaPinHasBeenSet(false),
-    m_visaPinVerificationValueHasBeenSet(false)
+    m_ibm3624PinFromOffsetHasBeenSet(false)
 {
 }
 
@@ -36,18 +36,18 @@ PinGenerationAttributes::PinGenerationAttributes(JsonView jsonValue)
 
 PinGenerationAttributes& PinGenerationAttributes::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("Ibm3624NaturalPin"))
+  if(jsonValue.ValueExists("VisaPin"))
   {
-    m_ibm3624NaturalPin = jsonValue.GetObject("Ibm3624NaturalPin");
+    m_visaPin = jsonValue.GetObject("VisaPin");
 
-    m_ibm3624NaturalPinHasBeenSet = true;
+    m_visaPinHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Ibm3624PinFromOffset"))
+  if(jsonValue.ValueExists("VisaPinVerificationValue"))
   {
-    m_ibm3624PinFromOffset = jsonValue.GetObject("Ibm3624PinFromOffset");
+    m_visaPinVerificationValue = jsonValue.GetObject("VisaPinVerificationValue");
 
-    m_ibm3624PinFromOffsetHasBeenSet = true;
+    m_visaPinVerificationValueHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("Ibm3624PinOffset"))
@@ -57,25 +57,25 @@ PinGenerationAttributes& PinGenerationAttributes::operator =(JsonView jsonValue)
     m_ibm3624PinOffsetHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Ibm3624RandomPin"))
+  if(jsonValue.ValueExists("Ibm3624NaturalPin"))
   {
-    m_ibm3624RandomPin = jsonValue.GetObject("Ibm3624RandomPin");
+    m_ibm3624NaturalPin = jsonValue.GetObject("Ibm3624NaturalPin");
 
-    m_ibm3624RandomPinHasBeenSet = true;
+    m_ibm3624NaturalPinHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("VisaPin"))
+  if(jsonValue.ValueExists("Ibm3624RandomPin"))
   {
-    m_visaPin = jsonValue.GetObject("VisaPin");
+    m_ibm3624RandomPin = jsonValue.GetObject("Ibm3624RandomPin");
 
-    m_visaPinHasBeenSet = true;
+    m_ibm3624RandomPinHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("VisaPinVerificationValue"))
+  if(jsonValue.ValueExists("Ibm3624PinFromOffset"))
   {
-    m_visaPinVerificationValue = jsonValue.GetObject("VisaPinVerificationValue");
+    m_ibm3624PinFromOffset = jsonValue.GetObject("Ibm3624PinFromOffset");
 
-    m_visaPinVerificationValueHasBeenSet = true;
+    m_ibm3624PinFromOffsetHasBeenSet = true;
   }
 
   return *this;
@@ -85,15 +85,15 @@ JsonValue PinGenerationAttributes::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_ibm3624NaturalPinHasBeenSet)
+  if(m_visaPinHasBeenSet)
   {
-   payload.WithObject("Ibm3624NaturalPin", m_ibm3624NaturalPin.Jsonize());
+   payload.WithObject("VisaPin", m_visaPin.Jsonize());
 
   }
 
-  if(m_ibm3624PinFromOffsetHasBeenSet)
+  if(m_visaPinVerificationValueHasBeenSet)
   {
-   payload.WithObject("Ibm3624PinFromOffset", m_ibm3624PinFromOffset.Jsonize());
+   payload.WithObject("VisaPinVerificationValue", m_visaPinVerificationValue.Jsonize());
 
   }
 
@@ -103,21 +103,21 @@ JsonValue PinGenerationAttributes::Jsonize() const
 
   }
 
-  if(m_ibm3624RandomPinHasBeenSet)
+  if(m_ibm3624NaturalPinHasBeenSet)
   {
-   payload.WithObject("Ibm3624RandomPin", m_ibm3624RandomPin.Jsonize());
+   payload.WithObject("Ibm3624NaturalPin", m_ibm3624NaturalPin.Jsonize());
 
   }
 
-  if(m_visaPinHasBeenSet)
+  if(m_ibm3624RandomPinHasBeenSet)
   {
-   payload.WithObject("VisaPin", m_visaPin.Jsonize());
+   payload.WithObject("Ibm3624RandomPin", m_ibm3624RandomPin.Jsonize());
 
   }
 
-  if(m_visaPinVerificationValueHasBeenSet)
+  if(m_ibm3624PinFromOffsetHasBeenSet)
   {
-   payload.WithObject("VisaPinVerificationValue", m_visaPinVerificationValue.Jsonize());
+   payload.WithObject("Ibm3624PinFromOffset", m_ibm3624PinFromOffset.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinVerificationAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinVerificationAttributes.cpp
index df82920bae7..9f2a7d947a0 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinVerificationAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/PinVerificationAttributes.cpp
@@ -19,8 +19,8 @@ namespace Model
 {
 
 PinVerificationAttributes::PinVerificationAttributes() : 
-    m_ibm3624PinHasBeenSet(false),
-    m_visaPinHasBeenSet(false)
+    m_visaPinHasBeenSet(false),
+    m_ibm3624PinHasBeenSet(false)
 {
 }
 
@@ -32,18 +32,18 @@ PinVerificationAttributes::PinVerificationAttributes(JsonView jsonValue)
 
 PinVerificationAttributes& PinVerificationAttributes::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("Ibm3624Pin"))
+  if(jsonValue.ValueExists("VisaPin"))
   {
-    m_ibm3624Pin = jsonValue.GetObject("Ibm3624Pin");
+    m_visaPin = jsonValue.GetObject("VisaPin");
 
-    m_ibm3624PinHasBeenSet = true;
+    m_visaPinHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("VisaPin"))
+  if(jsonValue.ValueExists("Ibm3624Pin"))
   {
-    m_visaPin = jsonValue.GetObject("VisaPin");
+    m_ibm3624Pin = jsonValue.GetObject("Ibm3624Pin");
 
-    m_visaPinHasBeenSet = true;
+    m_ibm3624PinHasBeenSet = true;
   }
 
   return *this;
@@ -53,15 +53,15 @@ JsonValue PinVerificationAttributes::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_ibm3624PinHasBeenSet)
+  if(m_visaPinHasBeenSet)
   {
-   payload.WithObject("Ibm3624Pin", m_ibm3624Pin.Jsonize());
+   payload.WithObject("VisaPin", m_visaPin.Jsonize());
 
   }
 
-  if(m_visaPinHasBeenSet)
+  if(m_ibm3624PinHasBeenSet)
   {
-   payload.WithObject("VisaPin", m_visaPin.Jsonize());
+   payload.WithObject("Ibm3624Pin", m_ibm3624Pin.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataRequest.cpp
index b0df6b3462a..98772f64b33 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataRequest.cpp
@@ -13,11 +13,13 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 ReEncryptDataRequest::ReEncryptDataRequest() : 
+    m_incomingKeyIdentifierHasBeenSet(false),
+    m_outgoingKeyIdentifierHasBeenSet(false),
     m_cipherTextHasBeenSet(false),
     m_incomingEncryptionAttributesHasBeenSet(false),
-    m_incomingKeyIdentifierHasBeenSet(false),
     m_outgoingEncryptionAttributesHasBeenSet(false),
-    m_outgoingKeyIdentifierHasBeenSet(false)
+    m_incomingWrappedKeyHasBeenSet(false),
+    m_outgoingWrappedKeyHasBeenSet(false)
 {
 }
 
@@ -25,6 +27,12 @@ Aws::String ReEncryptDataRequest::SerializePayload() const
 {
   JsonValue payload;
 
+  if(m_outgoingKeyIdentifierHasBeenSet)
+  {
+   payload.WithString("OutgoingKeyIdentifier", m_outgoingKeyIdentifier);
+
+  }
+
   if(m_cipherTextHasBeenSet)
   {
    payload.WithString("CipherText", m_cipherText);
@@ -43,9 +51,15 @@ Aws::String ReEncryptDataRequest::SerializePayload() const
 
   }
 
-  if(m_outgoingKeyIdentifierHasBeenSet)
+  if(m_incomingWrappedKeyHasBeenSet)
   {
-   payload.WithString("OutgoingKeyIdentifier", m_outgoingKeyIdentifier);
+   payload.WithObject("IncomingWrappedKey", m_incomingWrappedKey.Jsonize());
+
+  }
+
+  if(m_outgoingWrappedKeyHasBeenSet)
+  {
+   payload.WithObject("OutgoingWrappedKey", m_outgoingWrappedKey.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataResult.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataResult.cpp
index 61c6eeb2794..8b4a4d73712 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataResult.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptDataResult.cpp
@@ -29,12 +29,6 @@ ReEncryptDataResult::ReEncryptDataResult(const Aws::AmazonWebServiceResult<JsonV
 ReEncryptDataResult& ReEncryptDataResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
 {
   JsonView jsonValue = result.GetPayload().View();
-  if(jsonValue.ValueExists("CipherText"))
-  {
-    m_cipherText = jsonValue.GetString("CipherText");
-
-  }
-
   if(jsonValue.ValueExists("KeyArn"))
   {
     m_keyArn = jsonValue.GetString("KeyArn");
@@ -47,6 +41,12 @@ ReEncryptDataResult& ReEncryptDataResult::operator =(const Aws::AmazonWebService
 
   }
 
+  if(jsonValue.ValueExists("CipherText"))
+  {
+    m_cipherText = jsonValue.GetString("CipherText");
+
+  }
+
 
   const auto& headers = result.GetHeaderValueCollection();
   const auto& requestIdIter = headers.find("x-amzn-requestid");
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptionAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptionAttributes.cpp
index e335238730a..544f0ad2621 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptionAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ReEncryptionAttributes.cpp
@@ -19,8 +19,8 @@ namespace Model
 {
 
 ReEncryptionAttributes::ReEncryptionAttributes() : 
-    m_dukptHasBeenSet(false),
-    m_symmetricHasBeenSet(false)
+    m_symmetricHasBeenSet(false),
+    m_dukptHasBeenSet(false)
 {
 }
 
@@ -32,18 +32,18 @@ ReEncryptionAttributes::ReEncryptionAttributes(JsonView jsonValue)
 
 ReEncryptionAttributes& ReEncryptionAttributes::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("Dukpt"))
+  if(jsonValue.ValueExists("Symmetric"))
   {
-    m_dukpt = jsonValue.GetObject("Dukpt");
+    m_symmetric = jsonValue.GetObject("Symmetric");
 
-    m_dukptHasBeenSet = true;
+    m_symmetricHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Symmetric"))
+  if(jsonValue.ValueExists("Dukpt"))
   {
-    m_symmetric = jsonValue.GetObject("Symmetric");
+    m_dukpt = jsonValue.GetObject("Dukpt");
 
-    m_symmetricHasBeenSet = true;
+    m_dukptHasBeenSet = true;
   }
 
   return *this;
@@ -53,15 +53,15 @@ JsonValue ReEncryptionAttributes::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_dukptHasBeenSet)
+  if(m_symmetricHasBeenSet)
   {
-   payload.WithObject("Dukpt", m_dukpt.Jsonize());
+   payload.WithObject("Symmetric", m_symmetric.Jsonize());
 
   }
 
-  if(m_symmetricHasBeenSet)
+  if(m_dukptHasBeenSet)
   {
-   payload.WithObject("Symmetric", m_symmetric.Jsonize());
+   payload.WithObject("Dukpt", m_dukpt.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyAmex.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyAmex.cpp
index 558c5276995..b1b1f54b09f 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyAmex.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyAmex.cpp
@@ -19,8 +19,8 @@ namespace Model
 {
 
 SessionKeyAmex::SessionKeyAmex() : 
-    m_panSequenceNumberHasBeenSet(false),
-    m_primaryAccountNumberHasBeenSet(false)
+    m_primaryAccountNumberHasBeenSet(false),
+    m_panSequenceNumberHasBeenSet(false)
 {
 }
 
@@ -32,18 +32,18 @@ SessionKeyAmex::SessionKeyAmex(JsonView jsonValue)
 
 SessionKeyAmex& SessionKeyAmex::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("PanSequenceNumber"))
+  if(jsonValue.ValueExists("PrimaryAccountNumber"))
   {
-    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
+    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
 
-    m_panSequenceNumberHasBeenSet = true;
+    m_primaryAccountNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PrimaryAccountNumber"))
+  if(jsonValue.ValueExists("PanSequenceNumber"))
   {
-    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
+    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
 
-    m_primaryAccountNumberHasBeenSet = true;
+    m_panSequenceNumberHasBeenSet = true;
   }
 
   return *this;
@@ -53,15 +53,15 @@ JsonValue SessionKeyAmex::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_panSequenceNumberHasBeenSet)
+  if(m_primaryAccountNumberHasBeenSet)
   {
-   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
+   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
 
   }
 
-  if(m_primaryAccountNumberHasBeenSet)
+  if(m_panSequenceNumberHasBeenSet)
   {
-   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyDerivation.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyDerivation.cpp
index 44c7880d4b6..c5b60fe13c9 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyDerivation.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyDerivation.cpp
@@ -19,10 +19,10 @@ namespace Model
 {
 
 SessionKeyDerivation::SessionKeyDerivation() : 
-    m_amexHasBeenSet(false),
-    m_emv2000HasBeenSet(false),
     m_emvCommonHasBeenSet(false),
     m_mastercardHasBeenSet(false),
+    m_emv2000HasBeenSet(false),
+    m_amexHasBeenSet(false),
     m_visaHasBeenSet(false)
 {
 }
@@ -35,32 +35,32 @@ SessionKeyDerivation::SessionKeyDerivation(JsonView jsonValue)
 
 SessionKeyDerivation& SessionKeyDerivation::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("Amex"))
+  if(jsonValue.ValueExists("EmvCommon"))
   {
-    m_amex = jsonValue.GetObject("Amex");
+    m_emvCommon = jsonValue.GetObject("EmvCommon");
 
-    m_amexHasBeenSet = true;
+    m_emvCommonHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Emv2000"))
+  if(jsonValue.ValueExists("Mastercard"))
   {
-    m_emv2000 = jsonValue.GetObject("Emv2000");
+    m_mastercard = jsonValue.GetObject("Mastercard");
 
-    m_emv2000HasBeenSet = true;
+    m_mastercardHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("EmvCommon"))
+  if(jsonValue.ValueExists("Emv2000"))
   {
-    m_emvCommon = jsonValue.GetObject("EmvCommon");
+    m_emv2000 = jsonValue.GetObject("Emv2000");
 
-    m_emvCommonHasBeenSet = true;
+    m_emv2000HasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Mastercard"))
+  if(jsonValue.ValueExists("Amex"))
   {
-    m_mastercard = jsonValue.GetObject("Mastercard");
+    m_amex = jsonValue.GetObject("Amex");
 
-    m_mastercardHasBeenSet = true;
+    m_amexHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("Visa"))
@@ -77,27 +77,27 @@ JsonValue SessionKeyDerivation::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_amexHasBeenSet)
+  if(m_emvCommonHasBeenSet)
   {
-   payload.WithObject("Amex", m_amex.Jsonize());
+   payload.WithObject("EmvCommon", m_emvCommon.Jsonize());
 
   }
 
-  if(m_emv2000HasBeenSet)
+  if(m_mastercardHasBeenSet)
   {
-   payload.WithObject("Emv2000", m_emv2000.Jsonize());
+   payload.WithObject("Mastercard", m_mastercard.Jsonize());
 
   }
 
-  if(m_emvCommonHasBeenSet)
+  if(m_emv2000HasBeenSet)
   {
-   payload.WithObject("EmvCommon", m_emvCommon.Jsonize());
+   payload.WithObject("Emv2000", m_emv2000.Jsonize());
 
   }
 
-  if(m_mastercardHasBeenSet)
+  if(m_amexHasBeenSet)
   {
-   payload.WithObject("Mastercard", m_mastercard.Jsonize());
+   payload.WithObject("Amex", m_amex.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmv2000.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmv2000.cpp
index 9c45d39c4dd..97604eae4d7 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmv2000.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmv2000.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 SessionKeyEmv2000::SessionKeyEmv2000() : 
-    m_applicationTransactionCounterHasBeenSet(false),
+    m_primaryAccountNumberHasBeenSet(false),
     m_panSequenceNumberHasBeenSet(false),
-    m_primaryAccountNumberHasBeenSet(false)
+    m_applicationTransactionCounterHasBeenSet(false)
 {
 }
 
@@ -33,11 +33,11 @@ SessionKeyEmv2000::SessionKeyEmv2000(JsonView jsonValue)
 
 SessionKeyEmv2000& SessionKeyEmv2000::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
+  if(jsonValue.ValueExists("PrimaryAccountNumber"))
   {
-    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
+    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
 
-    m_applicationTransactionCounterHasBeenSet = true;
+    m_primaryAccountNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PanSequenceNumber"))
@@ -47,11 +47,11 @@ SessionKeyEmv2000& SessionKeyEmv2000::operator =(JsonView jsonValue)
     m_panSequenceNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PrimaryAccountNumber"))
+  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
   {
-    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
+    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
 
-    m_primaryAccountNumberHasBeenSet = true;
+    m_applicationTransactionCounterHasBeenSet = true;
   }
 
   return *this;
@@ -61,9 +61,9 @@ JsonValue SessionKeyEmv2000::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_applicationTransactionCounterHasBeenSet)
+  if(m_primaryAccountNumberHasBeenSet)
   {
-   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
+   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
 
   }
 
@@ -73,9 +73,9 @@ JsonValue SessionKeyEmv2000::Jsonize() const
 
   }
 
-  if(m_primaryAccountNumberHasBeenSet)
+  if(m_applicationTransactionCounterHasBeenSet)
   {
-   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmvCommon.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmvCommon.cpp
index e2242c84cd1..03a137cb7a6 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmvCommon.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyEmvCommon.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 SessionKeyEmvCommon::SessionKeyEmvCommon() : 
-    m_applicationTransactionCounterHasBeenSet(false),
+    m_primaryAccountNumberHasBeenSet(false),
     m_panSequenceNumberHasBeenSet(false),
-    m_primaryAccountNumberHasBeenSet(false)
+    m_applicationTransactionCounterHasBeenSet(false)
 {
 }
 
@@ -33,11 +33,11 @@ SessionKeyEmvCommon::SessionKeyEmvCommon(JsonView jsonValue)
 
 SessionKeyEmvCommon& SessionKeyEmvCommon::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
+  if(jsonValue.ValueExists("PrimaryAccountNumber"))
   {
-    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
+    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
 
-    m_applicationTransactionCounterHasBeenSet = true;
+    m_primaryAccountNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PanSequenceNumber"))
@@ -47,11 +47,11 @@ SessionKeyEmvCommon& SessionKeyEmvCommon::operator =(JsonView jsonValue)
     m_panSequenceNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PrimaryAccountNumber"))
+  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
   {
-    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
+    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
 
-    m_primaryAccountNumberHasBeenSet = true;
+    m_applicationTransactionCounterHasBeenSet = true;
   }
 
   return *this;
@@ -61,9 +61,9 @@ JsonValue SessionKeyEmvCommon::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_applicationTransactionCounterHasBeenSet)
+  if(m_primaryAccountNumberHasBeenSet)
   {
-   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
+   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
 
   }
 
@@ -73,9 +73,9 @@ JsonValue SessionKeyEmvCommon::Jsonize() const
 
   }
 
-  if(m_primaryAccountNumberHasBeenSet)
+  if(m_applicationTransactionCounterHasBeenSet)
   {
-   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyMastercard.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyMastercard.cpp
index 133ad420c72..79a6940eab2 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyMastercard.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyMastercard.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 SessionKeyMastercard::SessionKeyMastercard() : 
-    m_applicationTransactionCounterHasBeenSet(false),
-    m_panSequenceNumberHasBeenSet(false),
     m_primaryAccountNumberHasBeenSet(false),
+    m_panSequenceNumberHasBeenSet(false),
+    m_applicationTransactionCounterHasBeenSet(false),
     m_unpredictableNumberHasBeenSet(false)
 {
 }
@@ -34,11 +34,11 @@ SessionKeyMastercard::SessionKeyMastercard(JsonView jsonValue)
 
 SessionKeyMastercard& SessionKeyMastercard::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
+  if(jsonValue.ValueExists("PrimaryAccountNumber"))
   {
-    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
+    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
 
-    m_applicationTransactionCounterHasBeenSet = true;
+    m_primaryAccountNumberHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PanSequenceNumber"))
@@ -48,11 +48,11 @@ SessionKeyMastercard& SessionKeyMastercard::operator =(JsonView jsonValue)
     m_panSequenceNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PrimaryAccountNumber"))
+  if(jsonValue.ValueExists("ApplicationTransactionCounter"))
   {
-    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
+    m_applicationTransactionCounter = jsonValue.GetString("ApplicationTransactionCounter");
 
-    m_primaryAccountNumberHasBeenSet = true;
+    m_applicationTransactionCounterHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("UnpredictableNumber"))
@@ -69,9 +69,9 @@ JsonValue SessionKeyMastercard::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_applicationTransactionCounterHasBeenSet)
+  if(m_primaryAccountNumberHasBeenSet)
   {
-   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
+   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
 
   }
 
@@ -81,9 +81,9 @@ JsonValue SessionKeyMastercard::Jsonize() const
 
   }
 
-  if(m_primaryAccountNumberHasBeenSet)
+  if(m_applicationTransactionCounterHasBeenSet)
   {
-   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+   payload.WithString("ApplicationTransactionCounter", m_applicationTransactionCounter);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyVisa.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyVisa.cpp
index 0dfd24238b6..4e60f840140 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyVisa.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SessionKeyVisa.cpp
@@ -19,8 +19,8 @@ namespace Model
 {
 
 SessionKeyVisa::SessionKeyVisa() : 
-    m_panSequenceNumberHasBeenSet(false),
-    m_primaryAccountNumberHasBeenSet(false)
+    m_primaryAccountNumberHasBeenSet(false),
+    m_panSequenceNumberHasBeenSet(false)
 {
 }
 
@@ -32,18 +32,18 @@ SessionKeyVisa::SessionKeyVisa(JsonView jsonValue)
 
 SessionKeyVisa& SessionKeyVisa::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("PanSequenceNumber"))
+  if(jsonValue.ValueExists("PrimaryAccountNumber"))
   {
-    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
+    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
 
-    m_panSequenceNumberHasBeenSet = true;
+    m_primaryAccountNumberHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("PrimaryAccountNumber"))
+  if(jsonValue.ValueExists("PanSequenceNumber"))
   {
-    m_primaryAccountNumber = jsonValue.GetString("PrimaryAccountNumber");
+    m_panSequenceNumber = jsonValue.GetString("PanSequenceNumber");
 
-    m_primaryAccountNumberHasBeenSet = true;
+    m_panSequenceNumberHasBeenSet = true;
   }
 
   return *this;
@@ -53,15 +53,15 @@ JsonValue SessionKeyVisa::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_panSequenceNumberHasBeenSet)
+  if(m_primaryAccountNumberHasBeenSet)
   {
-   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
+   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
 
   }
 
-  if(m_primaryAccountNumberHasBeenSet)
+  if(m_panSequenceNumberHasBeenSet)
   {
-   payload.WithString("PrimaryAccountNumber", m_primaryAccountNumber);
+   payload.WithString("PanSequenceNumber", m_panSequenceNumber);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SymmetricEncryptionAttributes.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SymmetricEncryptionAttributes.cpp
index 8d2d4455a45..c1e6a77d8a6 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SymmetricEncryptionAttributes.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/SymmetricEncryptionAttributes.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 SymmetricEncryptionAttributes::SymmetricEncryptionAttributes() : 
-    m_initializationVectorHasBeenSet(false),
     m_mode(EncryptionMode::NOT_SET),
     m_modeHasBeenSet(false),
+    m_initializationVectorHasBeenSet(false),
     m_paddingType(PaddingType::NOT_SET),
     m_paddingTypeHasBeenSet(false)
 {
@@ -35,18 +35,18 @@ SymmetricEncryptionAttributes::SymmetricEncryptionAttributes(JsonView jsonValue)
 
 SymmetricEncryptionAttributes& SymmetricEncryptionAttributes::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("InitializationVector"))
+  if(jsonValue.ValueExists("Mode"))
   {
-    m_initializationVector = jsonValue.GetString("InitializationVector");
+    m_mode = EncryptionModeMapper::GetEncryptionModeForName(jsonValue.GetString("Mode"));
 
-    m_initializationVectorHasBeenSet = true;
+    m_modeHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Mode"))
+  if(jsonValue.ValueExists("InitializationVector"))
   {
-    m_mode = EncryptionModeMapper::GetEncryptionModeForName(jsonValue.GetString("Mode"));
+    m_initializationVector = jsonValue.GetString("InitializationVector");
 
-    m_modeHasBeenSet = true;
+    m_initializationVectorHasBeenSet = true;
   }
 
   if(jsonValue.ValueExists("PaddingType"))
@@ -63,15 +63,15 @@ JsonValue SymmetricEncryptionAttributes::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_initializationVectorHasBeenSet)
+  if(m_modeHasBeenSet)
   {
-   payload.WithString("InitializationVector", m_initializationVector);
-
+   payload.WithString("Mode", EncryptionModeMapper::GetNameForEncryptionMode(m_mode));
   }
 
-  if(m_modeHasBeenSet)
+  if(m_initializationVectorHasBeenSet)
   {
-   payload.WithString("Mode", EncryptionModeMapper::GetNameForEncryptionMode(m_mode));
+   payload.WithString("InitializationVector", m_initializationVector);
+
   }
 
   if(m_paddingTypeHasBeenSet)
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataRequest.cpp
index d65dee8f622..3e296513bdf 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataRequest.cpp
@@ -13,13 +13,15 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 TranslatePinDataRequest::TranslatePinDataRequest() : 
-    m_encryptedPinBlockHasBeenSet(false),
-    m_incomingDukptAttributesHasBeenSet(false),
     m_incomingKeyIdentifierHasBeenSet(false),
+    m_outgoingKeyIdentifierHasBeenSet(false),
     m_incomingTranslationAttributesHasBeenSet(false),
+    m_outgoingTranslationAttributesHasBeenSet(false),
+    m_encryptedPinBlockHasBeenSet(false),
+    m_incomingDukptAttributesHasBeenSet(false),
     m_outgoingDukptAttributesHasBeenSet(false),
-    m_outgoingKeyIdentifierHasBeenSet(false),
-    m_outgoingTranslationAttributesHasBeenSet(false)
+    m_incomingWrappedKeyHasBeenSet(false),
+    m_outgoingWrappedKeyHasBeenSet(false)
 {
 }
 
@@ -27,27 +29,39 @@ Aws::String TranslatePinDataRequest::SerializePayload() const
 {
   JsonValue payload;
 
-  if(m_encryptedPinBlockHasBeenSet)
+  if(m_incomingKeyIdentifierHasBeenSet)
   {
-   payload.WithString("EncryptedPinBlock", m_encryptedPinBlock);
+   payload.WithString("IncomingKeyIdentifier", m_incomingKeyIdentifier);
 
   }
 
-  if(m_incomingDukptAttributesHasBeenSet)
+  if(m_outgoingKeyIdentifierHasBeenSet)
   {
-   payload.WithObject("IncomingDukptAttributes", m_incomingDukptAttributes.Jsonize());
+   payload.WithString("OutgoingKeyIdentifier", m_outgoingKeyIdentifier);
 
   }
 
-  if(m_incomingKeyIdentifierHasBeenSet)
+  if(m_incomingTranslationAttributesHasBeenSet)
   {
-   payload.WithString("IncomingKeyIdentifier", m_incomingKeyIdentifier);
+   payload.WithObject("IncomingTranslationAttributes", m_incomingTranslationAttributes.Jsonize());
 
   }
 
-  if(m_incomingTranslationAttributesHasBeenSet)
+  if(m_outgoingTranslationAttributesHasBeenSet)
   {
-   payload.WithObject("IncomingTranslationAttributes", m_incomingTranslationAttributes.Jsonize());
+   payload.WithObject("OutgoingTranslationAttributes", m_outgoingTranslationAttributes.Jsonize());
+
+  }
+
+  if(m_encryptedPinBlockHasBeenSet)
+  {
+   payload.WithString("EncryptedPinBlock", m_encryptedPinBlock);
+
+  }
+
+  if(m_incomingDukptAttributesHasBeenSet)
+  {
+   payload.WithObject("IncomingDukptAttributes", m_incomingDukptAttributes.Jsonize());
 
   }
 
@@ -57,15 +71,15 @@ Aws::String TranslatePinDataRequest::SerializePayload() const
 
   }
 
-  if(m_outgoingKeyIdentifierHasBeenSet)
+  if(m_incomingWrappedKeyHasBeenSet)
   {
-   payload.WithString("OutgoingKeyIdentifier", m_outgoingKeyIdentifier);
+   payload.WithObject("IncomingWrappedKey", m_incomingWrappedKey.Jsonize());
 
   }
 
-  if(m_outgoingTranslationAttributesHasBeenSet)
+  if(m_outgoingWrappedKeyHasBeenSet)
   {
-   payload.WithObject("OutgoingTranslationAttributes", m_outgoingTranslationAttributes.Jsonize());
+   payload.WithObject("OutgoingWrappedKey", m_outgoingWrappedKey.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataResult.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataResult.cpp
index 10cc3dd2606..596813f214b 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataResult.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/TranslatePinDataResult.cpp
@@ -29,21 +29,21 @@ TranslatePinDataResult::TranslatePinDataResult(const Aws::AmazonWebServiceResult
 TranslatePinDataResult& TranslatePinDataResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
 {
   JsonView jsonValue = result.GetPayload().View();
-  if(jsonValue.ValueExists("KeyArn"))
+  if(jsonValue.ValueExists("PinBlock"))
   {
-    m_keyArn = jsonValue.GetString("KeyArn");
+    m_pinBlock = jsonValue.GetString("PinBlock");
 
   }
 
-  if(jsonValue.ValueExists("KeyCheckValue"))
+  if(jsonValue.ValueExists("KeyArn"))
   {
-    m_keyCheckValue = jsonValue.GetString("KeyCheckValue");
+    m_keyArn = jsonValue.GetString("KeyArn");
 
   }
 
-  if(jsonValue.ValueExists("PinBlock"))
+  if(jsonValue.ValueExists("KeyCheckValue"))
   {
-    m_pinBlock = jsonValue.GetString("PinBlock");
+    m_keyCheckValue = jsonValue.GetString("KeyCheckValue");
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationException.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationException.cpp
index 6bd2d717511..a5317f95e10 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationException.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationException.cpp
@@ -19,8 +19,8 @@ namespace Model
 {
 
 ValidationException::ValidationException() : 
-    m_fieldListHasBeenSet(false),
-    m_messageHasBeenSet(false)
+    m_messageHasBeenSet(false),
+    m_fieldListHasBeenSet(false)
 {
 }
 
@@ -32,6 +32,13 @@ ValidationException::ValidationException(JsonView jsonValue)
 
 ValidationException& ValidationException::operator =(JsonView jsonValue)
 {
+  if(jsonValue.ValueExists("message"))
+  {
+    m_message = jsonValue.GetString("message");
+
+    m_messageHasBeenSet = true;
+  }
+
   if(jsonValue.ValueExists("fieldList"))
   {
     Aws::Utils::Array<JsonView> fieldListJsonList = jsonValue.GetArray("fieldList");
@@ -42,13 +49,6 @@ ValidationException& ValidationException::operator =(JsonView jsonValue)
     m_fieldListHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("message"))
-  {
-    m_message = jsonValue.GetString("message");
-
-    m_messageHasBeenSet = true;
-  }
-
   return *this;
 }
 
@@ -56,6 +56,12 @@ JsonValue ValidationException::Jsonize() const
 {
   JsonValue payload;
 
+  if(m_messageHasBeenSet)
+  {
+   payload.WithString("message", m_message);
+
+  }
+
   if(m_fieldListHasBeenSet)
   {
    Aws::Utils::Array<JsonValue> fieldListJsonList(m_fieldList.size());
@@ -67,12 +73,6 @@ JsonValue ValidationException::Jsonize() const
 
   }
 
-  if(m_messageHasBeenSet)
-  {
-   payload.WithString("message", m_message);
-
-  }
-
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationExceptionField.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationExceptionField.cpp
index a0aaaef7704..e2cd0a7bb62 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationExceptionField.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/ValidationExceptionField.cpp
@@ -19,8 +19,8 @@ namespace Model
 {
 
 ValidationExceptionField::ValidationExceptionField() : 
-    m_messageHasBeenSet(false),
-    m_pathHasBeenSet(false)
+    m_pathHasBeenSet(false),
+    m_messageHasBeenSet(false)
 {
 }
 
@@ -32,18 +32,18 @@ ValidationExceptionField::ValidationExceptionField(JsonView jsonValue)
 
 ValidationExceptionField& ValidationExceptionField::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("message"))
+  if(jsonValue.ValueExists("path"))
   {
-    m_message = jsonValue.GetString("message");
+    m_path = jsonValue.GetString("path");
 
-    m_messageHasBeenSet = true;
+    m_pathHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("path"))
+  if(jsonValue.ValueExists("message"))
   {
-    m_path = jsonValue.GetString("path");
+    m_message = jsonValue.GetString("message");
 
-    m_pathHasBeenSet = true;
+    m_messageHasBeenSet = true;
   }
 
   return *this;
@@ -53,15 +53,15 @@ JsonValue ValidationExceptionField::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_messageHasBeenSet)
+  if(m_pathHasBeenSet)
   {
-   payload.WithString("message", m_message);
+   payload.WithString("path", m_path);
 
   }
 
-  if(m_pathHasBeenSet)
+  if(m_messageHasBeenSet)
   {
-   payload.WithString("path", m_path);
+   payload.WithString("message", m_message);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerificationFailedException.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerificationFailedException.cpp
index 802dd50a2b9..f3a13c5aca3 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerificationFailedException.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerificationFailedException.cpp
@@ -19,9 +19,9 @@ namespace Model
 {
 
 VerificationFailedException::VerificationFailedException() : 
-    m_messageHasBeenSet(false),
     m_reason(VerificationFailedReason::NOT_SET),
-    m_reasonHasBeenSet(false)
+    m_reasonHasBeenSet(false),
+    m_messageHasBeenSet(false)
 {
 }
 
@@ -33,18 +33,18 @@ VerificationFailedException::VerificationFailedException(JsonView jsonValue)
 
 VerificationFailedException& VerificationFailedException::operator =(JsonView jsonValue)
 {
-  if(jsonValue.ValueExists("Message"))
+  if(jsonValue.ValueExists("Reason"))
   {
-    m_message = jsonValue.GetString("Message");
+    m_reason = VerificationFailedReasonMapper::GetVerificationFailedReasonForName(jsonValue.GetString("Reason"));
 
-    m_messageHasBeenSet = true;
+    m_reasonHasBeenSet = true;
   }
 
-  if(jsonValue.ValueExists("Reason"))
+  if(jsonValue.ValueExists("Message"))
   {
-    m_reason = VerificationFailedReasonMapper::GetVerificationFailedReasonForName(jsonValue.GetString("Reason"));
+    m_message = jsonValue.GetString("Message");
 
-    m_reasonHasBeenSet = true;
+    m_messageHasBeenSet = true;
   }
 
   return *this;
@@ -54,15 +54,15 @@ JsonValue VerificationFailedException::Jsonize() const
 {
   JsonValue payload;
 
-  if(m_messageHasBeenSet)
+  if(m_reasonHasBeenSet)
   {
-   payload.WithString("Message", m_message);
-
+   payload.WithString("Reason", VerificationFailedReasonMapper::GetNameForVerificationFailedReason(m_reason));
   }
 
-  if(m_reasonHasBeenSet)
+  if(m_messageHasBeenSet)
   {
-   payload.WithString("Reason", VerificationFailedReasonMapper::GetNameForVerificationFailedReason(m_reason));
+   payload.WithString("Message", m_message);
+
   }
 
   return payload;
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramRequest.cpp
index 21f66252c57..03892499d3a 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramRequest.cpp
@@ -13,13 +13,13 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 VerifyAuthRequestCryptogramRequest::VerifyAuthRequestCryptogramRequest() : 
-    m_authRequestCryptogramHasBeenSet(false),
-    m_authResponseAttributesHasBeenSet(false),
     m_keyIdentifierHasBeenSet(false),
+    m_transactionDataHasBeenSet(false),
+    m_authRequestCryptogramHasBeenSet(false),
     m_majorKeyDerivationMode(MajorKeyDerivationMode::NOT_SET),
     m_majorKeyDerivationModeHasBeenSet(false),
     m_sessionKeyDerivationAttributesHasBeenSet(false),
-    m_transactionDataHasBeenSet(false)
+    m_authResponseAttributesHasBeenSet(false)
 {
 }
 
@@ -27,21 +27,21 @@ Aws::String VerifyAuthRequestCryptogramRequest::SerializePayload() const
 {
   JsonValue payload;
 
-  if(m_authRequestCryptogramHasBeenSet)
+  if(m_keyIdentifierHasBeenSet)
   {
-   payload.WithString("AuthRequestCryptogram", m_authRequestCryptogram);
+   payload.WithString("KeyIdentifier", m_keyIdentifier);
 
   }
 
-  if(m_authResponseAttributesHasBeenSet)
+  if(m_transactionDataHasBeenSet)
   {
-   payload.WithObject("AuthResponseAttributes", m_authResponseAttributes.Jsonize());
+   payload.WithString("TransactionData", m_transactionData);
 
   }
 
-  if(m_keyIdentifierHasBeenSet)
+  if(m_authRequestCryptogramHasBeenSet)
   {
-   payload.WithString("KeyIdentifier", m_keyIdentifier);
+   payload.WithString("AuthRequestCryptogram", m_authRequestCryptogram);
 
   }
 
@@ -56,9 +56,9 @@ Aws::String VerifyAuthRequestCryptogramRequest::SerializePayload() const
 
   }
 
-  if(m_transactionDataHasBeenSet)
+  if(m_authResponseAttributesHasBeenSet)
   {
-   payload.WithString("TransactionData", m_transactionData);
+   payload.WithObject("AuthResponseAttributes", m_authResponseAttributes.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramResult.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramResult.cpp
index 42266aaf844..16b7c7b5ba9 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramResult.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyAuthRequestCryptogramResult.cpp
@@ -29,12 +29,6 @@ VerifyAuthRequestCryptogramResult::VerifyAuthRequestCryptogramResult(const Aws::
 VerifyAuthRequestCryptogramResult& VerifyAuthRequestCryptogramResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
 {
   JsonView jsonValue = result.GetPayload().View();
-  if(jsonValue.ValueExists("AuthResponseValue"))
-  {
-    m_authResponseValue = jsonValue.GetString("AuthResponseValue");
-
-  }
-
   if(jsonValue.ValueExists("KeyArn"))
   {
     m_keyArn = jsonValue.GetString("KeyArn");
@@ -47,6 +41,12 @@ VerifyAuthRequestCryptogramResult& VerifyAuthRequestCryptogramResult::operator =
 
   }
 
+  if(jsonValue.ValueExists("AuthResponseValue"))
+  {
+    m_authResponseValue = jsonValue.GetString("AuthResponseValue");
+
+  }
+
 
   const auto& headers = result.GetHeaderValueCollection();
   const auto& requestIdIter = headers.find("x-amzn-requestid");
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyCardValidationDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyCardValidationDataRequest.cpp
index 9d8fe5edb2b..a8c4d5e7eb9 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyCardValidationDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyCardValidationDataRequest.cpp
@@ -15,8 +15,8 @@ using namespace Aws::Utils;
 VerifyCardValidationDataRequest::VerifyCardValidationDataRequest() : 
     m_keyIdentifierHasBeenSet(false),
     m_primaryAccountNumberHasBeenSet(false),
-    m_validationDataHasBeenSet(false),
-    m_verificationAttributesHasBeenSet(false)
+    m_verificationAttributesHasBeenSet(false),
+    m_validationDataHasBeenSet(false)
 {
 }
 
@@ -36,15 +36,15 @@ Aws::String VerifyCardValidationDataRequest::SerializePayload() const
 
   }
 
-  if(m_validationDataHasBeenSet)
+  if(m_verificationAttributesHasBeenSet)
   {
-   payload.WithString("ValidationData", m_validationData);
+   payload.WithObject("VerificationAttributes", m_verificationAttributes.Jsonize());
 
   }
 
-  if(m_verificationAttributesHasBeenSet)
+  if(m_validationDataHasBeenSet)
   {
-   payload.WithObject("VerificationAttributes", m_verificationAttributes.Jsonize());
+   payload.WithString("ValidationData", m_validationData);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyMacRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyMacRequest.cpp
index e49f9016044..3b5c6db5cac 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyMacRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyMacRequest.cpp
@@ -14,11 +14,11 @@ using namespace Aws::Utils;
 
 VerifyMacRequest::VerifyMacRequest() : 
     m_keyIdentifierHasBeenSet(false),
+    m_messageDataHasBeenSet(false),
     m_macHasBeenSet(false),
+    m_verificationAttributesHasBeenSet(false),
     m_macLength(0),
-    m_macLengthHasBeenSet(false),
-    m_messageDataHasBeenSet(false),
-    m_verificationAttributesHasBeenSet(false)
+    m_macLengthHasBeenSet(false)
 {
 }
 
@@ -32,27 +32,27 @@ Aws::String VerifyMacRequest::SerializePayload() const
 
   }
 
-  if(m_macHasBeenSet)
+  if(m_messageDataHasBeenSet)
   {
-   payload.WithString("Mac", m_mac);
+   payload.WithString("MessageData", m_messageData);
 
   }
 
-  if(m_macLengthHasBeenSet)
+  if(m_macHasBeenSet)
   {
-   payload.WithInteger("MacLength", m_macLength);
+   payload.WithString("Mac", m_mac);
 
   }
 
-  if(m_messageDataHasBeenSet)
+  if(m_verificationAttributesHasBeenSet)
   {
-   payload.WithString("MessageData", m_messageData);
+   payload.WithObject("VerificationAttributes", m_verificationAttributes.Jsonize());
 
   }
 
-  if(m_verificationAttributesHasBeenSet)
+  if(m_macLengthHasBeenSet)
   {
-   payload.WithObject("VerificationAttributes", m_verificationAttributes.Jsonize());
+   payload.WithInteger("MacLength", m_macLength);
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataRequest.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataRequest.cpp
index cd1dd70a87e..1843006789f 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataRequest.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataRequest.cpp
@@ -13,16 +13,16 @@ using namespace Aws::Utils::Json;
 using namespace Aws::Utils;
 
 VerifyPinDataRequest::VerifyPinDataRequest() : 
-    m_dukptAttributesHasBeenSet(false),
-    m_encryptedPinBlockHasBeenSet(false),
+    m_verificationKeyIdentifierHasBeenSet(false),
     m_encryptionKeyIdentifierHasBeenSet(false),
+    m_verificationAttributesHasBeenSet(false),
+    m_encryptedPinBlockHasBeenSet(false),
+    m_primaryAccountNumberHasBeenSet(false),
     m_pinBlockFormat(PinBlockFormatForPinData::NOT_SET),
     m_pinBlockFormatHasBeenSet(false),
     m_pinDataLength(0),
     m_pinDataLengthHasBeenSet(false),
-    m_primaryAccountNumberHasBeenSet(false),
-    m_verificationAttributesHasBeenSet(false),
-    m_verificationKeyIdentifierHasBeenSet(false)
+    m_dukptAttributesHasBeenSet(false)
 {
 }
 
@@ -30,15 +30,9 @@ Aws::String VerifyPinDataRequest::SerializePayload() const
 {
   JsonValue payload;
 
-  if(m_dukptAttributesHasBeenSet)
-  {
-   payload.WithObject("DukptAttributes", m_dukptAttributes.Jsonize());
-
-  }
-
-  if(m_encryptedPinBlockHasBeenSet)
+  if(m_verificationKeyIdentifierHasBeenSet)
   {
-   payload.WithString("EncryptedPinBlock", m_encryptedPinBlock);
+   payload.WithString("VerificationKeyIdentifier", m_verificationKeyIdentifier);
 
   }
 
@@ -48,14 +42,15 @@ Aws::String VerifyPinDataRequest::SerializePayload() const
 
   }
 
-  if(m_pinBlockFormatHasBeenSet)
+  if(m_verificationAttributesHasBeenSet)
   {
-   payload.WithString("PinBlockFormat", PinBlockFormatForPinDataMapper::GetNameForPinBlockFormatForPinData(m_pinBlockFormat));
+   payload.WithObject("VerificationAttributes", m_verificationAttributes.Jsonize());
+
   }
 
-  if(m_pinDataLengthHasBeenSet)
+  if(m_encryptedPinBlockHasBeenSet)
   {
-   payload.WithInteger("PinDataLength", m_pinDataLength);
+   payload.WithString("EncryptedPinBlock", m_encryptedPinBlock);
 
   }
 
@@ -65,15 +60,20 @@ Aws::String VerifyPinDataRequest::SerializePayload() const
 
   }
 
-  if(m_verificationAttributesHasBeenSet)
+  if(m_pinBlockFormatHasBeenSet)
   {
-   payload.WithObject("VerificationAttributes", m_verificationAttributes.Jsonize());
+   payload.WithString("PinBlockFormat", PinBlockFormatForPinDataMapper::GetNameForPinBlockFormatForPinData(m_pinBlockFormat));
+  }
+
+  if(m_pinDataLengthHasBeenSet)
+  {
+   payload.WithInteger("PinDataLength", m_pinDataLength);
 
   }
 
-  if(m_verificationKeyIdentifierHasBeenSet)
+  if(m_dukptAttributesHasBeenSet)
   {
-   payload.WithString("VerificationKeyIdentifier", m_verificationKeyIdentifier);
+   payload.WithObject("DukptAttributes", m_dukptAttributes.Jsonize());
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataResult.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataResult.cpp
index f7f06924b0f..86de08ed317 100644
--- a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataResult.cpp
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/VerifyPinDataResult.cpp
@@ -29,27 +29,27 @@ VerifyPinDataResult::VerifyPinDataResult(const Aws::AmazonWebServiceResult<JsonV
 VerifyPinDataResult& VerifyPinDataResult::operator =(const Aws::AmazonWebServiceResult<JsonValue>& result)
 {
   JsonView jsonValue = result.GetPayload().View();
-  if(jsonValue.ValueExists("EncryptionKeyArn"))
+  if(jsonValue.ValueExists("VerificationKeyArn"))
   {
-    m_encryptionKeyArn = jsonValue.GetString("EncryptionKeyArn");
+    m_verificationKeyArn = jsonValue.GetString("VerificationKeyArn");
 
   }
 
-  if(jsonValue.ValueExists("EncryptionKeyCheckValue"))
+  if(jsonValue.ValueExists("VerificationKeyCheckValue"))
   {
-    m_encryptionKeyCheckValue = jsonValue.GetString("EncryptionKeyCheckValue");
+    m_verificationKeyCheckValue = jsonValue.GetString("VerificationKeyCheckValue");
 
   }
 
-  if(jsonValue.ValueExists("VerificationKeyArn"))
+  if(jsonValue.ValueExists("EncryptionKeyArn"))
   {
-    m_verificationKeyArn = jsonValue.GetString("VerificationKeyArn");
+    m_encryptionKeyArn = jsonValue.GetString("EncryptionKeyArn");
 
   }
 
-  if(jsonValue.ValueExists("VerificationKeyCheckValue"))
+  if(jsonValue.ValueExists("EncryptionKeyCheckValue"))
   {
-    m_verificationKeyCheckValue = jsonValue.GetString("VerificationKeyCheckValue");
+    m_encryptionKeyCheckValue = jsonValue.GetString("EncryptionKeyCheckValue");
 
   }
 
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/WrappedKey.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/WrappedKey.cpp
new file mode 100644
index 00000000000..e2bee3e7ca8
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/WrappedKey.cpp
@@ -0,0 +1,73 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/payment-cryptography-data/model/WrappedKey.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace PaymentCryptographyData
+{
+namespace Model
+{
+
+WrappedKey::WrappedKey() : 
+    m_wrappedKeyMaterialHasBeenSet(false),
+    m_keyCheckValueAlgorithm(KeyCheckValueAlgorithm::NOT_SET),
+    m_keyCheckValueAlgorithmHasBeenSet(false)
+{
+}
+
+WrappedKey::WrappedKey(JsonView jsonValue)
+  : WrappedKey()
+{
+  *this = jsonValue;
+}
+
+WrappedKey& WrappedKey::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("WrappedKeyMaterial"))
+  {
+    m_wrappedKeyMaterial = jsonValue.GetObject("WrappedKeyMaterial");
+
+    m_wrappedKeyMaterialHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("KeyCheckValueAlgorithm"))
+  {
+    m_keyCheckValueAlgorithm = KeyCheckValueAlgorithmMapper::GetKeyCheckValueAlgorithmForName(jsonValue.GetString("KeyCheckValueAlgorithm"));
+
+    m_keyCheckValueAlgorithmHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue WrappedKey::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_wrappedKeyMaterialHasBeenSet)
+  {
+   payload.WithObject("WrappedKeyMaterial", m_wrappedKeyMaterial.Jsonize());
+
+  }
+
+  if(m_keyCheckValueAlgorithmHasBeenSet)
+  {
+   payload.WithString("KeyCheckValueAlgorithm", KeyCheckValueAlgorithmMapper::GetNameForKeyCheckValueAlgorithm(m_keyCheckValueAlgorithm));
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace PaymentCryptographyData
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/WrappedKeyMaterial.cpp b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/WrappedKeyMaterial.cpp
new file mode 100644
index 00000000000..4727ab10320
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-payment-cryptography-data/source/model/WrappedKeyMaterial.cpp
@@ -0,0 +1,59 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/payment-cryptography-data/model/WrappedKeyMaterial.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace PaymentCryptographyData
+{
+namespace Model
+{
+
+WrappedKeyMaterial::WrappedKeyMaterial() : 
+    m_tr31KeyBlockHasBeenSet(false)
+{
+}
+
+WrappedKeyMaterial::WrappedKeyMaterial(JsonView jsonValue)
+  : WrappedKeyMaterial()
+{
+  *this = jsonValue;
+}
+
+WrappedKeyMaterial& WrappedKeyMaterial::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("Tr31KeyBlock"))
+  {
+    m_tr31KeyBlock = jsonValue.GetString("Tr31KeyBlock");
+
+    m_tr31KeyBlockHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue WrappedKeyMaterial::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_tr31KeyBlockHasBeenSet)
+  {
+   payload.WithString("Tr31KeyBlock", m_tr31KeyBlock);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace PaymentCryptographyData
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-wafv2/include/aws/wafv2/model/JsonBody.h b/generated/src/aws-cpp-sdk-wafv2/include/aws/wafv2/model/JsonBody.h
index fd8c328a8cd..31a01988220 100644
--- a/generated/src/aws-cpp-sdk-wafv2/include/aws/wafv2/model/JsonBody.h
+++ b/generated/src/aws-cpp-sdk-wafv2/include/aws/wafv2/model/JsonBody.h
@@ -34,7 +34,9 @@ namespace Model
    * inspect using the rule's inspection criteria. WAF inspects only the parts of the
    * JSON that result from the matches that you indicate. </p> <p>Example JSON:
    * <code>"JsonBody": { "MatchPattern": { "All": {} }, "MatchScope": "ALL" }</code>
-   * </p><p><h3>See Also:</h3>   <a
+   * </p> <p>For additional information about this request component option, see <a
+   * href="https://docs.aws.amazon.com/waf/latest/developerguide/waf-rule-statement-fields-list.html#waf-rule-statement-request-component-json-body">JSON
+   * body</a> in the <i>WAF Developer Guide</i>.</p><p><h3>See Also:</h3>   <a
    * href="http://docs.aws.amazon.com/goto/WebAPI/wafv2-2019-07-29/JsonBody">AWS API
    * Reference</a></p>
    */
@@ -89,13 +91,11 @@ namespace Model
      * <code>NO_MATCH</code> - Treat the web request as not matching the rule
      * statement.</p> </li> </ul> <p>If you don't provide this setting, WAF parses and
      * evaluates the content only up to the first parsing failure that it encounters.
-     * </p> <p>WAF does its best to parse the entire JSON body, but might be forced to
-     * stop for reasons such as invalid characters, duplicate keys, truncation, and any
-     * content whose root node isn't an object or an array. </p> <p>WAF parses the JSON
-     * in the following examples as two valid key, value pairs: </p> <ul> <li>
-     * <p>Missing comma: <code>{"key1":"value1""key2":"value2"}</code> </p> </li> <li>
-     * <p>Missing colon: <code>{"key1":"value1","key2""value2"}</code> </p> </li> <li>
-     * <p>Extra colons: <code>{"key1"::"value1","key2""value2"}</code> </p> </li> </ul>
+     * </p>  <p>WAF parsing doesn't fully validate the input JSON string, so
+     * parsing can succeed even for invalid JSON. When parsing succeeds, WAF doesn't
+     * apply the fallback behavior. For more information, see <a
+     * href="https://docs.aws.amazon.com/waf/latest/developerguide/waf-rule-statement-fields-list.html#waf-rule-statement-request-component-json-body">JSON
+     * body</a> in the <i>WAF Developer Guide</i>.</p> 
      */
     inline const BodyParsingFallbackBehavior& GetInvalidFallbackBehavior() const{ return m_invalidFallbackBehavior; }
     inline bool InvalidFallbackBehaviorHasBeenSet() const { return m_invalidFallbackBehaviorHasBeenSet; }
diff --git a/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h b/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
index bf76b5653b3..aa1a36f4563 100644
--- a/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
+++ b/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#define AWS_SDK_VERSION_STRING "1.11.359"
+#define AWS_SDK_VERSION_STRING "1.11.360"
 #define AWS_SDK_VERSION_MAJOR 1
 #define AWS_SDK_VERSION_MINOR 11
-#define AWS_SDK_VERSION_PATCH 359
+#define AWS_SDK_VERSION_PATCH 360
diff --git a/tools/code-generation/api-descriptions/apigateway-2015-07-09.normal.json b/tools/code-generation/api-descriptions/apigateway-2015-07-09.normal.json
index 626f33d5a4d..a86e1c4745c 100644
--- a/tools/code-generation/api-descriptions/apigateway-2015-07-09.normal.json
+++ b/tools/code-generation/api-descriptions/apigateway-2015-07-09.normal.json
@@ -4,10 +4,12 @@
     "apiVersion":"2015-07-09",
     "endpointPrefix":"apigateway",
     "protocol":"rest-json",
+    "protocols":["rest-json"],
     "serviceFullName":"Amazon API Gateway",
     "serviceId":"API Gateway",
     "signatureVersion":"v4",
-    "uid":"apigateway-2015-07-09"
+    "uid":"apigateway-2015-07-09",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CreateApiKey":{
diff --git a/tools/code-generation/api-descriptions/cognito-identity-2014-06-30.normal.json b/tools/code-generation/api-descriptions/cognito-identity-2014-06-30.normal.json
index 8d2f084b987..f93ded368d1 100644
--- a/tools/code-generation/api-descriptions/cognito-identity-2014-06-30.normal.json
+++ b/tools/code-generation/api-descriptions/cognito-identity-2014-06-30.normal.json
@@ -5,11 +5,13 @@
     "endpointPrefix":"cognito-identity",
     "jsonVersion":"1.1",
     "protocol":"json",
+    "protocols":["json"],
     "serviceFullName":"Amazon Cognito Identity",
     "serviceId":"Cognito Identity",
     "signatureVersion":"v4",
     "targetPrefix":"AWSCognitoIdentityService",
-    "uid":"cognito-identity-2014-06-30"
+    "uid":"cognito-identity-2014-06-30",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CreateIdentityPool":{
@@ -114,7 +116,8 @@
         {"shape":"ExternalServiceException"}
       ],
       "documentation":"<p>Returns credentials for the provided identity ID. Any provided logins will be validated against supported login providers. If the token is for cognito-identity.amazonaws.com, it will be passed through to AWS Security Token Service with the appropriate role for the token.</p> <p>This is a public API. You do not need any credentials to call this API.</p>",
-      "authtype":"none"
+      "authtype":"none",
+      "auth":["smithy.api#noAuth"]
     },
     "GetId":{
       "name":"GetId",
@@ -135,7 +138,8 @@
         {"shape":"ExternalServiceException"}
       ],
       "documentation":"<p>Generates (or retrieves) a Cognito ID. Supplying multiple logins will create an implicit linked account.</p> <p>This is a public API. You do not need any credentials to call this API.</p>",
-      "authtype":"none"
+      "authtype":"none",
+      "auth":["smithy.api#noAuth"]
     },
     "GetIdentityPoolRoles":{
       "name":"GetIdentityPoolRoles",
@@ -173,7 +177,8 @@
         {"shape":"ExternalServiceException"}
       ],
       "documentation":"<p>Gets an OpenID token, using a known Cognito ID. This known Cognito ID is returned by <a>GetId</a>. You can optionally add additional logins for the identity. Supplying multiple logins creates an implicit link.</p> <p>The OpenID token is valid for 10 minutes.</p> <p>This is a public API. You do not need any credentials to call this API.</p>",
-      "authtype":"none"
+      "authtype":"none",
+      "auth":["smithy.api#noAuth"]
     },
     "GetOpenIdTokenForDeveloperIdentity":{
       "name":"GetOpenIdTokenForDeveloperIdentity",
@@ -384,7 +389,8 @@
         {"shape":"ExternalServiceException"}
       ],
       "documentation":"<p>Unlinks a federated identity from an existing account. Unlinked logins will be considered new identities next time they are seen. Removing the last linked login will make this identity inaccessible.</p> <p>This is a public API. You do not need any credentials to call this API.</p>",
-      "authtype":"none"
+      "authtype":"none",
+      "auth":["smithy.api#noAuth"]
     },
     "UntagResource":{
       "name":"UntagResource",
diff --git a/tools/code-generation/api-descriptions/connect-2017-08-08.normal.json b/tools/code-generation/api-descriptions/connect-2017-08-08.normal.json
index d7b330d33f8..febf835fd33 100644
--- a/tools/code-generation/api-descriptions/connect-2017-08-08.normal.json
+++ b/tools/code-generation/api-descriptions/connect-2017-08-08.normal.json
@@ -1276,6 +1276,23 @@
       ],
       "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change.</p> <p>Describes an agent status.</p>"
     },
+    "DescribeAuthenticationProfile":{
+      "name":"DescribeAuthenticationProfile",
+      "http":{
+        "method":"GET",
+        "requestUri":"/authentication-profiles/{InstanceId}/{AuthenticationProfileId}"
+      },
+      "input":{"shape":"DescribeAuthenticationProfileRequest"},
+      "output":{"shape":"DescribeAuthenticationProfileResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change. To request access to this API, contact Amazon Web Services Support.</p> <p>Describes the target authentication profile.</p>"
+    },
     "DescribeContact":{
       "name":"DescribeContact",
       "http":{
@@ -2152,6 +2169,23 @@
       ],
       "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change.</p> <p>Returns a paginated list of all approved origins associated with the instance.</p>"
     },
+    "ListAuthenticationProfiles":{
+      "name":"ListAuthenticationProfiles",
+      "http":{
+        "method":"GET",
+        "requestUri":"/authentication-profiles-summary/{InstanceId}"
+      },
+      "input":{"shape":"ListAuthenticationProfilesRequest"},
+      "output":{"shape":"ListAuthenticationProfilesResponse"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change. To request access to this API, contact Amazon Web Services Support.</p> <p>Provides summary information about the authentication profiles in a specified Amazon Connect instance.</p>"
+    },
     "ListBots":{
       "name":"ListBots",
       "http":{
@@ -3242,7 +3276,7 @@
         {"shape":"ResourceConflictException"},
         {"shape":"ServiceQuotaExceededException"}
       ],
-      "documentation":"<p>Provides a pre-signed Amazon S3 URL in response for uploading your content.</p> <important> <p>You may only use this API to upload attachments to a <a href=\"https://docs.aws.amazon.com/connect/latest/APIReference/API_connect-cases_CreateCase.html\">Connect Case</a>.</p> </important>"
+      "documentation":"<p>Provides a pre-signed Amazon S3 URL in response for uploading your content.</p> <important> <p>You may only use this API to upload attachments to an <a href=\"https://docs.aws.amazon.com/connect/latest/APIReference/API_connect-cases_CreateCase.html\">Amazon Connect Case</a>.</p> </important>"
     },
     "StartChatContact":{
       "name":"StartChatContact",
@@ -3552,6 +3586,22 @@
       ],
       "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change.</p> <p>Updates agent status.</p>"
     },
+    "UpdateAuthenticationProfile":{
+      "name":"UpdateAuthenticationProfile",
+      "http":{
+        "method":"POST",
+        "requestUri":"/authentication-profiles/{InstanceId}/{AuthenticationProfileId}"
+      },
+      "input":{"shape":"UpdateAuthenticationProfileRequest"},
+      "errors":[
+        {"shape":"InvalidRequestException"},
+        {"shape":"InvalidParameterException"},
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"InternalServiceException"}
+      ],
+      "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change. To request access to this API, contact Amazon Web Services Support.</p> <p>Updates the selected authentication profile.</p>"
+    },
     "UpdateContact":{
       "name":"UpdateContact",
       "http":{
@@ -4331,6 +4381,12 @@
       "error":{"httpStatusCode":403},
       "exception":true
     },
+    "AccessTokenDuration":{
+      "type":"integer",
+      "box":true,
+      "max":60,
+      "min":10
+    },
     "ActionSummaries":{
       "type":"list",
       "member":{"shape":"ActionSummary"}
@@ -5470,6 +5526,109 @@
       "documentation":"<p>Contains information for score and potential quality issues for Audio</p>"
     },
     "AudioQualityScore":{"type":"float"},
+    "AuthenticationProfile":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"AuthenticationProfileId",
+          "documentation":"<p>A unique identifier for the authentication profile. </p>"
+        },
+        "Arn":{
+          "shape":"ARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) for the authentication profile.</p>"
+        },
+        "Name":{
+          "shape":"AuthenticationProfileName",
+          "documentation":"<p>The name for the authentication profile.</p>"
+        },
+        "Description":{
+          "shape":"AuthenticationProfileDescription",
+          "documentation":"<p>The description for the authentication profile.</p>"
+        },
+        "AllowedIps":{
+          "shape":"IpCidrList",
+          "documentation":"<p>A list of IP address range strings that are allowed to access the Amazon Connect instance. For more information about how to configure IP addresses, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-ip-based-ac\">Configure IP address based access control</a> in the <i>Amazon Connect Administrator Guide</i>.</p>"
+        },
+        "BlockedIps":{
+          "shape":"IpCidrList",
+          "documentation":"<p>A list of IP address range strings that are blocked from accessing the Amazon Connect instance. For more information about how to configure IP addresses, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-ip-based-ac\">Configure IP address based access control</a> in the <i>Amazon Connect Administrator Guide</i>.</p>"
+        },
+        "IsDefault":{
+          "shape":"Boolean",
+          "documentation":"<p>Shows whether the authentication profile is the default authentication profile for the Amazon Connect instance. The default authentication profile applies to all agents in an Amazon Connect instance, unless overridden by another authentication profile.</p>"
+        },
+        "CreatedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp when the authentication profile was created.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp when the authentication profile was last modified.</p>"
+        },
+        "LastModifiedRegion":{
+          "shape":"RegionName",
+          "documentation":"<p>The Amazon Web Services Region where the authentication profile was last modified.</p>"
+        },
+        "PeriodicSessionDuration":{
+          "shape":"AccessTokenDuration",
+          "documentation":"<p>The short lived session duration configuration for users logged in to Amazon Connect, in minutes. This value determines the maximum possible time before an agent is authenticated. For more information, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts\">Configure the session duration</a> in the <i>Amazon Connect Administrator Guide</i>.</p>"
+        },
+        "MaxSessionDuration":{
+          "shape":"RefreshTokenDuration",
+          "documentation":"<p>The long lived session duration for users logged in to Amazon Connect, in minutes. After this time period, users must log in again. For more information, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts\">Configure the session duration</a> in the <i>Amazon Connect Administrator Guide</i>.</p>"
+        }
+      },
+      "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change. To request access to this API, contact Amazon Web Services Support.</p> <p>Information about an authentication profile. An authentication profile is a resource that stores the authentication settings for users in your contact center. You use authentication profiles to set up IP address range restrictions and session timeouts. For more information, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html\">Set IP address restrictions or session timeouts</a>. </p>"
+    },
+    "AuthenticationProfileDescription":{
+      "type":"string",
+      "max":250,
+      "min":1
+    },
+    "AuthenticationProfileId":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "AuthenticationProfileName":{
+      "type":"string",
+      "max":128,
+      "min":1
+    },
+    "AuthenticationProfileSummary":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"AuthenticationProfileId",
+          "documentation":"<p>The unique identifier of the authentication profile.</p>"
+        },
+        "Arn":{
+          "shape":"ARN",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the authentication profile summary.</p>"
+        },
+        "Name":{
+          "shape":"AuthenticationProfileName",
+          "documentation":"<p>The name of the authentication profile summary.</p>"
+        },
+        "IsDefault":{
+          "shape":"Boolean",
+          "documentation":"<p>Shows whether the authentication profile is the default authentication profile for the Amazon Connect instance. The default authentication profile applies to all agents in an Amazon Connect instance, unless overridden by another authentication profile.</p>"
+        },
+        "LastModifiedTime":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp when the authentication profile summary was last modified.</p>"
+        },
+        "LastModifiedRegion":{
+          "shape":"RegionName",
+          "documentation":"<p>The Amazon Web Services Region when the authentication profile summary was last modified.</p>"
+        }
+      },
+      "documentation":"<p>This API is in preview release for Amazon Connect and is subject to change. To request access to this API, contact Amazon Web Services Support.</p> <p>A summary of a given authentication profile.</p>"
+    },
+    "AuthenticationProfileSummaryList":{
+      "type":"list",
+      "member":{"shape":"AuthenticationProfileSummary"}
+    },
     "AutoAccept":{"type":"boolean"},
     "AvailableNumberSummary":{
       "type":"structure",
@@ -5943,7 +6102,7 @@
       "members":{
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>The unique identifier of the Connect instance.</p>",
+          "documentation":"<p>The unique identifier of the Amazon Connect instance.</p>",
           "location":"uri",
           "locationName":"InstanceId"
         },
@@ -8785,6 +8944,36 @@
         }
       }
     },
+    "DescribeAuthenticationProfileRequest":{
+      "type":"structure",
+      "required":[
+        "AuthenticationProfileId",
+        "InstanceId"
+      ],
+      "members":{
+        "AuthenticationProfileId":{
+          "shape":"AuthenticationProfileId",
+          "documentation":"<p>A unique identifier for the authentication profile. </p>",
+          "location":"uri",
+          "locationName":"AuthenticationProfileId"
+        },
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>The identifier of the Amazon Connect instance. You can <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html\">find the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>",
+          "location":"uri",
+          "locationName":"InstanceId"
+        }
+      }
+    },
+    "DescribeAuthenticationProfileResponse":{
+      "type":"structure",
+      "members":{
+        "AuthenticationProfile":{
+          "shape":"AuthenticationProfile",
+          "documentation":"<p>The authentication profile object being described.</p>"
+        }
+      }
+    },
     "DescribeContactEvaluationRequest":{
       "type":"structure",
       "required":[
@@ -12832,6 +13021,16 @@
       "type":"list",
       "member":{"shape":"InvisibleFieldInfo"}
     },
+    "IpCidr":{
+      "type":"string",
+      "max":50,
+      "min":2,
+      "pattern":"^[A-Za-z0-9:/]*$"
+    },
+    "IpCidrList":{
+      "type":"list",
+      "member":{"shape":"IpCidr"}
+    },
     "JoinToken":{
       "type":"string",
       "sensitive":true
@@ -13086,6 +13285,44 @@
         }
       }
     },
+    "ListAuthenticationProfilesRequest":{
+      "type":"structure",
+      "required":["InstanceId"],
+      "members":{
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>The identifier of the Amazon Connect instance. You can <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html\">find the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>",
+          "location":"uri",
+          "locationName":"InstanceId"
+        },
+        "MaxResults":{
+          "shape":"MaxResult1000",
+          "documentation":"<p>The maximum number of results to return per page.</p>",
+          "box":true,
+          "location":"querystring",
+          "locationName":"maxResults"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>The token for the next set of results. Use the value returned in the previous response in the next request to retrieve the next set of results.</p>",
+          "location":"querystring",
+          "locationName":"nextToken"
+        }
+      }
+    },
+    "ListAuthenticationProfilesResponse":{
+      "type":"structure",
+      "members":{
+        "AuthenticationProfileSummaryList":{
+          "shape":"AuthenticationProfileSummaryList",
+          "documentation":"<p>A summary of a given authentication profile.</p>"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "documentation":"<p>If there are additional results, this is the token for the next set of results.</p>"
+        }
+      }
+    },
     "ListBotsRequest":{
       "type":"structure",
       "required":[
@@ -17233,6 +17470,12 @@
       "max":4096,
       "min":0
     },
+    "RefreshTokenDuration":{
+      "type":"integer",
+      "box":true,
+      "max":720,
+      "min":360
+    },
     "RegionName":{
       "type":"string",
       "pattern":"[a-z]{2}(-[a-z]+){1,2}(-[0-9])?"
@@ -18102,7 +18345,7 @@
       "members":{
         "ContactFlows":{
           "shape":"ContactFlowSearchSummaryList",
-          "documentation":"<p>Information about the contact flows.</p>"
+          "documentation":"<p>Information about the flows.</p>"
         },
         "NextToken":{
           "shape":"NextToken2500",
@@ -19191,7 +19434,7 @@
         },
         "InstanceId":{
           "shape":"InstanceId",
-          "documentation":"<p>The unique identifier of the Connect instance.</p>",
+          "documentation":"<p>The unique identifier of the Amazon Connect instance.</p>",
           "location":"uri",
           "locationName":"InstanceId"
         },
@@ -19612,7 +19855,7 @@
         },
         "ContactFlowId":{
           "shape":"ContactFlowId",
-          "documentation":"<p>The identifier of the flow for the call. To see the ContactFlowId in the Amazon Connect admin website, on the navigation menu go to <b>Routing</b>, <b>Contact Flows</b>. Choose the flow. On the flow page, under the name of the flow, choose <b>Show additional flow information</b>. The ContactFlowId is the last part of the ARN, shown here in bold: </p> <p>arn:aws:connect:us-west-2:xxxxxxxxxxxx:instance/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/contact-flow/<b>846ec553-a005-41c0-8341-xxxxxxxxxxxx</b> </p>"
+          "documentation":"<p>The identifier of the flow for the call. To see the ContactFlowId in the Amazon Connect admin website, on the navigation menu go to <b>Routing</b>, <b>Flows</b>. Choose the flow. On the flow page, under the name of the flow, choose <b>Show additional flow information</b>. The ContactFlowId is the last part of the ARN, shown here in bold: </p> <p>arn:aws:connect:us-west-2:xxxxxxxxxxxx:instance/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/contact-flow/<b>846ec553-a005-41c0-8341-xxxxxxxxxxxx</b> </p>"
         },
         "InstanceId":{
           "shape":"InstanceId",
@@ -20734,6 +20977,48 @@
         }
       }
     },
+    "UpdateAuthenticationProfileRequest":{
+      "type":"structure",
+      "required":[
+        "AuthenticationProfileId",
+        "InstanceId"
+      ],
+      "members":{
+        "AuthenticationProfileId":{
+          "shape":"AuthenticationProfileId",
+          "documentation":"<p>A unique identifier for the authentication profile. </p>",
+          "location":"uri",
+          "locationName":"AuthenticationProfileId"
+        },
+        "InstanceId":{
+          "shape":"InstanceId",
+          "documentation":"<p>The identifier of the Amazon Connect instance. You can <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/find-instance-arn.html\">find the instance ID</a> in the Amazon Resource Name (ARN) of the instance.</p>",
+          "location":"uri",
+          "locationName":"InstanceId"
+        },
+        "Name":{
+          "shape":"AuthenticationProfileName",
+          "documentation":"<p>The name for the authentication profile.</p>"
+        },
+        "Description":{
+          "shape":"AuthenticationProfileDescription",
+          "documentation":"<p>The description for the authentication profile.</p>"
+        },
+        "AllowedIps":{
+          "shape":"IpCidrList",
+          "documentation":"<p>A list of IP address range strings that are allowed to access the instance. For more information on how to configure IP addresses, see<a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts\">Configure session timeouts</a> in the <i>Amazon Connect Administrator Guide</i>.</p>"
+        },
+        "BlockedIps":{
+          "shape":"IpCidrList",
+          "documentation":"<p>A list of IP address range strings that are blocked from accessing the instance. For more information on how to configure IP addresses, For more information on how to configure IP addresses, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-ip-based-ac\">Configure IP-based access control</a> in the <i>Amazon Connect Administrator Guide</i>. </p>"
+        },
+        "PeriodicSessionDuration":{
+          "shape":"AccessTokenDuration",
+          "documentation":"<p>The short lived session duration configuration for users logged in to Amazon Connect, in minutes. This value determines the maximum possible time before an agent is authenticated. For more information, For more information on how to configure IP addresses, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/authentication-profiles.html#configure-session-timeouts\">Configure session timeouts</a> in the <i>Amazon Connect Administrator Guide</i>. </p>",
+          "box":true
+        }
+      }
+    },
     "UpdateCaseActionDefinition":{
       "type":"structure",
       "required":["Fields"],
@@ -23184,5 +23469,5 @@
     },
     "timestamp":{"type":"timestamp"}
   },
-  "documentation":"<p>Amazon Connect is a cloud-based contact center solution that you use to set up and manage a customer contact center and provide reliable customer engagement at any scale.</p> <p>Amazon Connect provides metrics and real-time reporting that enable you to optimize contact routing. You can also resolve customer issues more efficiently by getting customers in touch with the appropriate agents.</p> <p>There are limits to the number of Amazon Connect resources that you can create. There are also limits to the number of requests that you can make per second. For more information, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/amazon-connect-service-limits.html\">Amazon Connect Service Quotas</a> in the <i>Amazon Connect Administrator Guide</i>.</p> <p>You can connect programmatically to an Amazon Web Services service by using an endpoint. For a list of Amazon Connect endpoints, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/connect_region.html\">Amazon Connect Endpoints</a>.</p>"
+  "documentation":"<ul> <li> <p> <a href=\"https://docs.aws.amazon.com/connect/latest/APIReference/API_Operations_Amazon_Connect_Service.html\">Amazon Connect actions</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/connect/latest/APIReference/API_Types_Amazon_Connect_Service.html\">Amazon Connect data types</a> </p> </li> </ul> <p>Amazon Connect is a cloud-based contact center solution that you use to set up and manage a customer contact center and provide reliable customer engagement at any scale.</p> <p>Amazon Connect provides metrics and real-time reporting that enable you to optimize contact routing. You can also resolve customer issues more efficiently by getting customers in touch with the appropriate agents.</p> <p>There are limits to the number of Amazon Connect resources that you can create. There are also limits to the number of requests that you can make per second. For more information, see <a href=\"https://docs.aws.amazon.com/connect/latest/adminguide/amazon-connect-service-limits.html\">Amazon Connect Service Quotas</a> in the <i>Amazon Connect Administrator Guide</i>.</p> <p>You can connect programmatically to an Amazon Web Services service by using an endpoint. For a list of Amazon Connect endpoints, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/connect_region.html\">Amazon Connect Endpoints</a>.</p>"
 }
diff --git a/tools/code-generation/api-descriptions/docdb-2014-10-31.normal.json b/tools/code-generation/api-descriptions/docdb-2014-10-31.normal.json
index 8cc37568bdd..eda9de9b07a 100644
--- a/tools/code-generation/api-descriptions/docdb-2014-10-31.normal.json
+++ b/tools/code-generation/api-descriptions/docdb-2014-10-31.normal.json
@@ -4,13 +4,15 @@
     "apiVersion":"2014-10-31",
     "endpointPrefix":"rds",
     "protocol":"query",
+    "protocols":["query"],
     "serviceAbbreviation":"Amazon DocDB",
     "serviceFullName":"Amazon DocumentDB with MongoDB compatibility",
     "serviceId":"DocDB",
     "signatureVersion":"v4",
     "signingName":"rds",
     "uid":"docdb-2014-10-31",
-    "xmlNamespace":"http://rds.amazonaws.com/doc/2014-10-31/"
+    "xmlNamespace":"http://rds.amazonaws.com/doc/2014-10-31/",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "AddSourceIdentifierToSubscription":{
diff --git a/tools/code-generation/api-descriptions/eks-2017-11-01.normal.json b/tools/code-generation/api-descriptions/eks-2017-11-01.normal.json
index 284fb87d2a3..ac6e3994970 100644
--- a/tools/code-generation/api-descriptions/eks-2017-11-01.normal.json
+++ b/tools/code-generation/api-descriptions/eks-2017-11-01.normal.json
@@ -1501,7 +1501,8 @@
       "type":"string",
       "enum":[
         "ON_DEMAND",
-        "SPOT"
+        "SPOT",
+        "CAPACITY_BLOCK"
       ]
     },
     "Category":{
diff --git a/tools/code-generation/api-descriptions/payment-cryptography-2021-09-14.normal.json b/tools/code-generation/api-descriptions/payment-cryptography-2021-09-14.normal.json
index dd3cd6abdcb..fa667a29b9a 100644
--- a/tools/code-generation/api-descriptions/payment-cryptography-2021-09-14.normal.json
+++ b/tools/code-generation/api-descriptions/payment-cryptography-2021-09-14.normal.json
@@ -2,9 +2,11 @@
   "version":"2.0",
   "metadata":{
     "apiVersion":"2021-09-14",
+    "auth":["aws.auth#sigv4"],
     "endpointPrefix":"controlplane.payment-cryptography",
     "jsonVersion":"1.0",
     "protocol":"json",
+    "protocols":["json"],
     "serviceFullName":"Payment Cryptography Control Plane",
     "serviceId":"Payment Cryptography",
     "signatureVersion":"v4",
@@ -561,6 +563,12 @@
         }
       }
     },
+    "EvenHexLengthBetween16And32":{
+      "type":"string",
+      "max":32,
+      "min":16,
+      "pattern":"(?:[0-9a-fA-F][0-9a-fA-F])+"
+    },
     "ExportAttributes":{
       "type":"structure",
       "members":{
@@ -702,7 +710,7 @@
           "documentation":"<p>The format of key block that Amazon Web Services Payment Cryptography will use during key export.</p>"
         },
         "RandomNonce":{
-          "shape":"HexLength16",
+          "shape":"EvenHexLengthBetween16And32",
           "documentation":"<p>A random number value that is unique to the TR-34 key block generated using 2 pass. The operation will fail, if a random nonce value is not provided for a TR-34 key block generated using 2 pass.</p>"
         },
         "KeyBlockHeaders":{
@@ -877,12 +885,6 @@
         }
       }
     },
-    "HexLength16":{
-      "type":"string",
-      "max":16,
-      "min":16,
-      "pattern":"[0-9A-F]+"
-    },
     "HexLength20Or24":{
       "type":"string",
       "max":24,
@@ -1030,7 +1032,7 @@
           "documentation":"<p>The key block format to use during key import. The only value allowed is <code>X9_TR34_2012</code>.</p>"
         },
         "RandomNonce":{
-          "shape":"HexLength16",
+          "shape":"EvenHexLengthBetween16And32",
           "documentation":"<p>A random number value that is unique to the TR-34 key block generated using 2 pass. The operation will fail, if a random nonce value is not provided for a TR-34 key block generated using 2 pass.</p>"
         }
       },
@@ -1674,7 +1676,8 @@
       "type":"string",
       "max":9984,
       "min":56,
-      "pattern":"[0-9A-Z]+"
+      "pattern":"[0-9A-Z]+",
+      "sensitive":true
     },
     "Tr34KeyBlockFormat":{
       "type":"string",
diff --git a/tools/code-generation/api-descriptions/payment-cryptography-data-2022-02-03.normal.json b/tools/code-generation/api-descriptions/payment-cryptography-data-2022-02-03.normal.json
index 01666625e5c..a4f6b34c881 100644
--- a/tools/code-generation/api-descriptions/payment-cryptography-data-2022-02-03.normal.json
+++ b/tools/code-generation/api-descriptions/payment-cryptography-data-2022-02-03.normal.json
@@ -2,9 +2,10 @@
   "version":"2.0",
   "metadata":{
     "apiVersion":"2022-02-03",
+    "auth":["aws.auth#sigv4"],
     "endpointPrefix":"dataplane.payment-cryptography",
-    "jsonVersion":"1.1",
     "protocol":"rest-json",
+    "protocols":["rest-json"],
     "serviceFullName":"Payment Cryptography Data Plane",
     "serviceId":"Payment Cryptography Data",
     "signatureVersion":"v4",
@@ -118,7 +119,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Re-encrypt ciphertext using DUKPT, Symmetric and Asymmetric Data Encryption Keys. </p> <p>You can either generate an encryption key within Amazon Web Services Payment Cryptography by calling <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_CreateKey.html\">CreateKey</a> or import your own encryption key by calling <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ImportKey.html\">ImportKey</a>. The <code>KeyArn</code> for use with this operation must be in a compatible key state with <code>KeyModesOfUse</code> set to <code>Encrypt</code>. In asymmetric encryption, ciphertext is encrypted using public component (imported by calling <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ImportKey.html\">ImportKey</a>) of the asymmetric key pair created outside of Amazon Web Services Payment Cryptography. </p> <p>For symmetric and DUKPT encryption, Amazon Web Services Payment Cryptography supports <code>TDES</code> and <code>AES</code> algorithms. For asymmetric encryption, Amazon Web Services Payment Cryptography supports <code>RSA</code>. To encrypt using DUKPT, a DUKPT key must already exist within your account with <code>KeyModesOfUse</code> set to <code>DeriveKey</code> or a new DUKPT can be generated by calling <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_CreateKey.html\">CreateKey</a>.</p> <p>For information about valid keys for this operation, see <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/userguide/keys-validattributes.html\">Understanding key attributes</a> and <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/userguide/crypto-ops-validkeys-ops.html\">Key types for specific data operations</a> in the <i>Amazon Web Services Payment Cryptography User Guide</i>. </p> <p> <b>Cross-account use</b>: This operation can't be used across different Amazon Web Services accounts.</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>DecryptData</a> </p> </li> <li> <p> <a>EncryptData</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_GetPublicKeyCertificate.html\">GetPublicCertificate</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ImportKey.html\">ImportKey</a> </p> </li> </ul>"
+      "documentation":"<p>Re-encrypt ciphertext using DUKPT or Symmetric data encryption keys. </p> <p>You can either generate an encryption key within Amazon Web Services Payment Cryptography by calling <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_CreateKey.html\">CreateKey</a> or import your own encryption key by calling <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ImportKey.html\">ImportKey</a>. The <code>KeyArn</code> for use with this operation must be in a compatible key state with <code>KeyModesOfUse</code> set to <code>Encrypt</code>. </p> <p>For symmetric and DUKPT encryption, Amazon Web Services Payment Cryptography supports <code>TDES</code> and <code>AES</code> algorithms. To encrypt using DUKPT, a DUKPT key must already exist within your account with <code>KeyModesOfUse</code> set to <code>DeriveKey</code> or a new DUKPT can be generated by calling <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_CreateKey.html\">CreateKey</a>.</p> <p>For information about valid keys for this operation, see <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/userguide/keys-validattributes.html\">Understanding key attributes</a> and <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/userguide/crypto-ops-validkeys-ops.html\">Key types for specific data operations</a> in the <i>Amazon Web Services Payment Cryptography User Guide</i>. </p> <p> <b>Cross-account use</b>: This operation can't be used across different Amazon Web Services accounts.</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>DecryptData</a> </p> </li> <li> <p> <a>EncryptData</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_GetPublicKeyCertificate.html\">GetPublicCertificate</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/API_ImportKey.html\">ImportKey</a> </p> </li> </ul>"
     },
     "TranslatePinData":{
       "name":"TranslatePinData",
@@ -275,10 +276,6 @@
           "shape":"AmexCardSecurityCodeVersion2",
           "documentation":"<p>Card data parameters that are required to generate a Card Security Code (CSC2) for an AMEX payment card.</p>"
         },
-        "CardHolderVerificationValue":{
-          "shape":"CardHolderVerificationValue",
-          "documentation":"<p>Card data parameters that are required to generate a cardholder verification value for the payment card.</p>"
-        },
         "CardVerificationValue1":{
           "shape":"CardVerificationValue1",
           "documentation":"<p>Card data parameters that are required to generate Card Verification Value (CVV) for the payment card.</p>"
@@ -287,6 +284,10 @@
           "shape":"CardVerificationValue2",
           "documentation":"<p>Card data parameters that are required to generate Card Verification Value (CVV2) for the payment card.</p>"
         },
+        "CardHolderVerificationValue":{
+          "shape":"CardHolderVerificationValue",
+          "documentation":"<p>Card data parameters that are required to generate a cardholder verification value for the payment card.</p>"
+        },
         "DynamicCardVerificationCode":{
           "shape":"DynamicCardVerificationCode",
           "documentation":"<p>Card data parameters that are required to generate CDynamic Card Verification Code (dCVC) for the payment card.</p>"
@@ -302,22 +303,22 @@
     "CardHolderVerificationValue":{
       "type":"structure",
       "required":[
-        "ApplicationTransactionCounter",
+        "UnpredictableNumber",
         "PanSequenceNumber",
-        "UnpredictableNumber"
+        "ApplicationTransactionCounter"
       ],
       "members":{
-        "ApplicationTransactionCounter":{
-          "shape":"HexLengthBetween2And4",
-          "documentation":"<p>The transaction counter value that comes from a point of sale terminal.</p>"
+        "UnpredictableNumber":{
+          "shape":"HexLengthBetween2And8",
+          "documentation":"<p>A random number generated by the issuer.</p>"
         },
         "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
+          "shape":"NumberLengthEquals2",
           "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         },
-        "UnpredictableNumber":{
-          "shape":"HexLengthBetween2And8",
-          "documentation":"<p>A random number generated by the issuer.</p>"
+        "ApplicationTransactionCounter":{
+          "shape":"HexLengthBetween2And4",
+          "documentation":"<p>The transaction counter value that comes from a point of sale terminal.</p>"
         }
       },
       "documentation":"<p>Card data parameters that are required to generate a cardholder verification value for the payment card.</p>"
@@ -330,10 +331,6 @@
           "shape":"AmexCardSecurityCodeVersion2",
           "documentation":"<p>Card data parameters that are required to verify a Card Security Code (CSC2) for an AMEX payment card.</p>"
         },
-        "CardHolderVerificationValue":{
-          "shape":"CardHolderVerificationValue",
-          "documentation":"<p>Card data parameters that are required to verify a cardholder verification value for the payment card.</p>"
-        },
         "CardVerificationValue1":{
           "shape":"CardVerificationValue1",
           "documentation":"<p>Card data parameters that are required to verify Card Verification Value (CVV) for the payment card.</p>"
@@ -342,9 +339,9 @@
           "shape":"CardVerificationValue2",
           "documentation":"<p>Card data parameters that are required to verify Card Verification Value (CVV2) for the payment card.</p>"
         },
-        "DiscoverDynamicCardVerificationCode":{
-          "shape":"DiscoverDynamicCardVerificationCode",
-          "documentation":"<p>Card data parameters that are required to verify CDynamic Card Verification Code (dCVC) for the payment card.</p>"
+        "CardHolderVerificationValue":{
+          "shape":"CardHolderVerificationValue",
+          "documentation":"<p>Card data parameters that are required to verify a cardholder verification value for the payment card.</p>"
         },
         "DynamicCardVerificationCode":{
           "shape":"DynamicCardVerificationCode",
@@ -353,6 +350,10 @@
         "DynamicCardVerificationValue":{
           "shape":"DynamicCardVerificationValue",
           "documentation":"<p>Card data parameters that are required to verify CDynamic Card Verification Value (dCVV) for the payment card.</p>"
+        },
+        "DiscoverDynamicCardVerificationCode":{
+          "shape":"DiscoverDynamicCardVerificationCode",
+          "documentation":"<p>Card data parameters that are required to verify CDynamic Card Verification Code (dCVC) for the payment card.</p>"
         }
       },
       "documentation":"<p>Card data parameters that are requried to verify Card Verification Values (CVV/CVV2), Dynamic Card Verification Values (dCVV/dCVV2), or Card Security Codes (CSC).</p>",
@@ -431,11 +432,17 @@
     "DecryptDataInput":{
       "type":"structure",
       "required":[
+        "KeyIdentifier",
         "CipherText",
-        "DecryptionAttributes",
-        "KeyIdentifier"
+        "DecryptionAttributes"
       ],
       "members":{
+        "KeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the encryption key that Amazon Web Services Payment Cryptography uses for ciphertext decryption.</p> <p>When a WrappedKeyBlock is provided, this value will be the identifier to the key wrapping key. Otherwise, it is the key identifier used to perform the operation.</p>",
+          "location":"uri",
+          "locationName":"KeyIdentifier"
+        },
         "CipherText":{
           "shape":"HexEvenLengthBetween16And4096",
           "documentation":"<p>The ciphertext to decrypt.</p>"
@@ -444,11 +451,9 @@
           "shape":"EncryptionDecryptionAttributes",
           "documentation":"<p>The encryption key type and attributes for ciphertext decryption.</p>"
         },
-        "KeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the encryption key that Amazon Web Services Payment Cryptography uses for ciphertext decryption.</p>",
-          "location":"uri",
-          "locationName":"KeyIdentifier"
+        "WrappedKey":{
+          "shape":"WrappedKey",
+          "documentation":"<p>The WrappedKeyBlock containing the encryption key for ciphertext decryption.</p>"
         }
       }
     },
@@ -477,15 +482,11 @@
     "DiscoverDynamicCardVerificationCode":{
       "type":"structure",
       "required":[
-        "ApplicationTransactionCounter",
         "CardExpiryDate",
-        "UnpredictableNumber"
+        "UnpredictableNumber",
+        "ApplicationTransactionCounter"
       ],
       "members":{
-        "ApplicationTransactionCounter":{
-          "shape":"HexLengthBetween2And4",
-          "documentation":"<p>The transaction counter value that comes from the terminal.</p>"
-        },
         "CardExpiryDate":{
           "shape":"NumberLengthEquals4",
           "documentation":"<p>The expiry date of a payment card.</p>"
@@ -493,6 +494,10 @@
         "UnpredictableNumber":{
           "shape":"HexLengthBetween2And8",
           "documentation":"<p>A random number that is generated by the issuer.</p>"
+        },
+        "ApplicationTransactionCounter":{
+          "shape":"HexLengthBetween2And4",
+          "documentation":"<p>The transaction counter value that comes from the terminal.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to generate or verify dCVC (Dynamic Card Verification Code).</p>"
@@ -500,17 +505,17 @@
     "DukptAttributes":{
       "type":"structure",
       "required":[
-        "DukptDerivationType",
-        "KeySerialNumber"
+        "KeySerialNumber",
+        "DukptDerivationType"
       ],
       "members":{
-        "DukptDerivationType":{
-          "shape":"DukptDerivationType",
-          "documentation":"<p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key Serial Number (KSN). This must be less than or equal to the strength of the BDK. For example, you can't use <code>AES_128</code> as a derivation type for a BDK of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>"
-        },
         "KeySerialNumber":{
           "shape":"HexLengthBetween10And24",
           "documentation":"<p>The unique identifier known as Key Serial Number (KSN) that comes from an encrypting device using DUKPT encryption method. The KSN is derived from the encrypting device unique identifier and an internal transaction counter.</p>"
+        },
+        "DukptDerivationType":{
+          "shape":"DukptDerivationType",
+          "documentation":"<p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key Serial Number (KSN). This must be less than or equal to the strength of the BDK. For example, you can't use <code>AES_128</code> as a derivation type for a BDK of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>"
         }
       },
       "documentation":"<p>Parameters that are used for Derived Unique Key Per Transaction (DUKPT) derivation algorithm.</p>"
@@ -519,6 +524,10 @@
       "type":"structure",
       "required":["KeySerialNumber"],
       "members":{
+        "KeySerialNumber":{
+          "shape":"HexLengthBetween10And24",
+          "documentation":"<p>The unique identifier known as Key Serial Number (KSN) that comes from an encrypting device using DUKPT encryption method. The KSN is derived from the encrypting device unique identifier and an internal transaction counter.</p>"
+        },
         "DukptKeyDerivationType":{
           "shape":"DukptDerivationType",
           "documentation":"<p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key Serial Number (KSN). This must be less than or equal to the strength of the BDK. For example, you can't use <code>AES_128</code> as a derivation type for a BDK of <code>AES_128</code> or <code>TDES_2KEY</code> </p>"
@@ -526,10 +535,6 @@
         "DukptKeyVariant":{
           "shape":"DukptKeyVariant",
           "documentation":"<p>The type of use of DUKPT, which can be for incoming data decryption, outgoing data encryption, or both.</p>"
-        },
-        "KeySerialNumber":{
-          "shape":"HexLengthBetween10And24",
-          "documentation":"<p>The unique identifier known as Key Serial Number (KSN) that comes from an encrypting device using DUKPT encryption method. The KSN is derived from the encrypting device unique identifier and an internal transaction counter.</p>"
         }
       },
       "documentation":"<p>Parameters required for encryption or decryption of data using DUKPT.</p>"
@@ -548,6 +553,14 @@
       "type":"structure",
       "required":["KeySerialNumber"],
       "members":{
+        "KeySerialNumber":{
+          "shape":"HexLengthBetween10And24",
+          "documentation":"<p>The unique identifier known as Key Serial Number (KSN) that comes from an encrypting device using DUKPT encryption method. The KSN is derived from the encrypting device unique identifier and an internal transaction counter.</p>"
+        },
+        "Mode":{
+          "shape":"DukptEncryptionMode",
+          "documentation":"<p>The block cipher method to use for encryption.</p> <p>The default is CBC.</p>"
+        },
         "DukptKeyDerivationType":{
           "shape":"DukptDerivationType",
           "documentation":"<p>The key type encrypted using DUKPT from a Base Derivation Key (BDK) and Key Serial Number (KSN). This must be less than or equal to the strength of the BDK. For example, you can't use <code>AES_128</code> as a derivation type for a BDK of <code>AES_128</code> or <code>TDES_2KEY</code> </p>"
@@ -559,14 +572,6 @@
         "InitializationVector":{
           "shape":"HexLength16Or32",
           "documentation":"<p>An input used to provide the intial state. If no value is provided, Amazon Web Services Payment Cryptography defaults it to zero.</p>"
-        },
-        "KeySerialNumber":{
-          "shape":"HexLengthBetween10And24",
-          "documentation":"<p>The unique identifier known as Key Serial Number (KSN) that comes from an encrypting device using DUKPT encryption method. The KSN is derived from the encrypting device unique identifier and an internal transaction counter.</p>"
-        },
-        "Mode":{
-          "shape":"DukptEncryptionMode",
-          "documentation":"<p>The block cipher method to use for encryption.</p> <p>The default is CBC.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to encrypt plaintext data using DUKPT.</p>"
@@ -589,27 +594,27 @@
     "DynamicCardVerificationCode":{
       "type":"structure",
       "required":[
-        "ApplicationTransactionCounter",
+        "UnpredictableNumber",
         "PanSequenceNumber",
-        "TrackData",
-        "UnpredictableNumber"
+        "ApplicationTransactionCounter",
+        "TrackData"
       ],
       "members":{
-        "ApplicationTransactionCounter":{
-          "shape":"HexLengthBetween2And4",
-          "documentation":"<p>The transaction counter value that comes from the terminal.</p>"
+        "UnpredictableNumber":{
+          "shape":"HexLengthBetween2And8",
+          "documentation":"<p>A random number generated by the issuer.</p>"
         },
         "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
+          "shape":"NumberLengthEquals2",
           "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         },
+        "ApplicationTransactionCounter":{
+          "shape":"HexLengthBetween2And4",
+          "documentation":"<p>The transaction counter value that comes from the terminal.</p>"
+        },
         "TrackData":{
           "shape":"HexLengthBetween2And160",
           "documentation":"<p>The data on the two tracks of magnetic cards used for financial transactions. This includes the cardholder name, PAN, expiration date, bank ID (BIN) and several other numbers the issuing bank uses to validate the data received.</p>"
-        },
-        "UnpredictableNumber":{
-          "shape":"HexLengthBetween2And8",
-          "documentation":"<p>A random number generated by the issuer.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to generate or verify Dynamic Card Verification Value (dCVV).</p>"
@@ -617,27 +622,27 @@
     "DynamicCardVerificationValue":{
       "type":"structure",
       "required":[
-        "ApplicationTransactionCounter",
-        "CardExpiryDate",
         "PanSequenceNumber",
-        "ServiceCode"
+        "CardExpiryDate",
+        "ServiceCode",
+        "ApplicationTransactionCounter"
       ],
       "members":{
-        "ApplicationTransactionCounter":{
-          "shape":"HexLengthBetween2And4",
-          "documentation":"<p>The transaction counter value that comes from the terminal.</p>"
+        "PanSequenceNumber":{
+          "shape":"NumberLengthEquals2",
+          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         },
         "CardExpiryDate":{
           "shape":"NumberLengthEquals4",
           "documentation":"<p>The expiry date of a payment card.</p>"
         },
-        "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
-          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
-        },
         "ServiceCode":{
           "shape":"NumberLengthEquals3",
           "documentation":"<p>The service code of the payment card. This is different from Card Security Code (CSC).</p>"
+        },
+        "ApplicationTransactionCounter":{
+          "shape":"HexLengthBetween2And4",
+          "documentation":"<p>The transaction counter value that comes from the terminal.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to generate or verify Dynamic Card Verification Value (dCVV).</p>"
@@ -646,34 +651,34 @@
       "type":"structure",
       "required":[
         "MajorKeyDerivationMode",
-        "PanSequenceNumber",
         "PrimaryAccountNumber",
+        "PanSequenceNumber",
         "SessionDerivationData"
       ],
       "members":{
-        "InitializationVector":{
-          "shape":"HexLength16Or32",
-          "documentation":"<p>An input used to provide the intial state. If no value is provided, Amazon Web Services Payment Cryptography defaults it to zero.</p>"
-        },
         "MajorKeyDerivationMode":{
           "shape":"EmvMajorKeyDerivationMode",
           "documentation":"<p>The EMV derivation mode to use for ICC master key derivation as per EMV version 4.3 book 2.</p>"
         },
-        "Mode":{
-          "shape":"EmvEncryptionMode",
-          "documentation":"<p>The block cipher method to use for encryption.</p>"
-        },
-        "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
-          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
-        },
         "PrimaryAccountNumber":{
           "shape":"NumberLengthBetween12And19",
           "documentation":"<p>The Primary Account Number (PAN), a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
         },
+        "PanSequenceNumber":{
+          "shape":"NumberLengthEquals2",
+          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
+        },
         "SessionDerivationData":{
           "shape":"HexLengthEquals16",
           "documentation":"<p>The derivation value used to derive the ICC session key. It is typically the application transaction counter value padded with zeros or previous ARQC value padded with zeros as per EMV version 4.3 book 2.</p>"
+        },
+        "Mode":{
+          "shape":"EmvEncryptionMode",
+          "documentation":"<p>The block cipher method to use for encryption.</p>"
+        },
+        "InitializationVector":{
+          "shape":"HexLength16Or32",
+          "documentation":"<p>An input used to provide the intial state. If no value is provided, Amazon Web Services Payment Cryptography defaults it to zero.</p>"
         }
       },
       "documentation":"<p>Parameters for plaintext encryption using EMV keys.</p>"
@@ -695,38 +700,38 @@
     "EncryptDataInput":{
       "type":"structure",
       "required":[
-        "EncryptionAttributes",
         "KeyIdentifier",
-        "PlainText"
+        "PlainText",
+        "EncryptionAttributes"
       ],
       "members":{
-        "EncryptionAttributes":{
-          "shape":"EncryptionDecryptionAttributes",
-          "documentation":"<p>The encryption key type and attributes for plaintext encryption.</p>"
-        },
         "KeyIdentifier":{
           "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the encryption key that Amazon Web Services Payment Cryptography uses for plaintext encryption.</p>",
+          "documentation":"<p>The <code>keyARN</code> of the encryption key that Amazon Web Services Payment Cryptography uses for plaintext encryption.</p> <p>When a WrappedKeyBlock is provided, this value will be the identifier to the key wrapping key. Otherwise, it is the key identifier used to perform the operation.</p>",
           "location":"uri",
           "locationName":"KeyIdentifier"
         },
         "PlainText":{
           "shape":"HexEvenLengthBetween16And4064",
           "documentation":"<p>The plaintext to be encrypted.</p> <note> <p>For encryption using asymmetric keys, plaintext data length is constrained by encryption key strength that you define in <code>KeyAlgorithm</code> and padding type that you define in <code>AsymmetricEncryptionAttributes</code>. For more information, see <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/userguide/encrypt-data.html\">Encrypt data</a> in the <i>Amazon Web Services Payment Cryptography User Guide</i>.</p> </note>"
+        },
+        "EncryptionAttributes":{
+          "shape":"EncryptionDecryptionAttributes",
+          "documentation":"<p>The encryption key type and attributes for plaintext encryption.</p>"
+        },
+        "WrappedKey":{
+          "shape":"WrappedKey",
+          "documentation":"<p>The WrappedKeyBlock containing the encryption key for plaintext encryption.</p>"
         }
       }
     },
     "EncryptDataOutput":{
       "type":"structure",
       "required":[
-        "CipherText",
-        "KeyArn"
+        "KeyArn",
+        "CipherText"
       ],
       "members":{
-        "CipherText":{
-          "shape":"HexEvenLengthBetween16And4096",
-          "documentation":"<p>The encrypted ciphertext.</p>"
-        },
         "KeyArn":{
           "shape":"KeyArn",
           "documentation":"<p>The <code>keyARN</code> of the encryption key that Amazon Web Services Payment Cryptography uses for plaintext encryption.</p>"
@@ -734,21 +739,25 @@
         "KeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
+        },
+        "CipherText":{
+          "shape":"HexEvenLengthBetween16And4096",
+          "documentation":"<p>The encrypted ciphertext.</p>"
         }
       }
     },
     "EncryptionDecryptionAttributes":{
       "type":"structure",
       "members":{
+        "Symmetric":{
+          "shape":"SymmetricEncryptionAttributes",
+          "documentation":"<p>Parameters that are required to perform encryption and decryption using symmetric keys.</p>"
+        },
         "Asymmetric":{"shape":"AsymmetricEncryptionAttributes"},
         "Dukpt":{"shape":"DukptEncryptionAttributes"},
         "Emv":{
           "shape":"EmvEncryptionAttributes",
           "documentation":"<p>Parameters for plaintext encryption using EMV keys.</p>"
-        },
-        "Symmetric":{
-          "shape":"SymmetricEncryptionAttributes",
-          "documentation":"<p>Parameters that are required to perform encryption and decryption using symmetric keys.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to perform encryption and decryption operations.</p>",
@@ -770,15 +779,11 @@
     "GenerateCardValidationDataInput":{
       "type":"structure",
       "required":[
-        "GenerationAttributes",
         "KeyIdentifier",
-        "PrimaryAccountNumber"
+        "PrimaryAccountNumber",
+        "GenerationAttributes"
       ],
       "members":{
-        "GenerationAttributes":{
-          "shape":"CardGenerationAttributes",
-          "documentation":"<p>The algorithm for generating CVV or CSC values for the card within Amazon Web Services Payment Cryptography.</p>"
-        },
         "KeyIdentifier":{
           "shape":"KeyArnOrKeyAliasType",
           "documentation":"<p>The <code>keyARN</code> of the CVK encryption key that Amazon Web Services Payment Cryptography uses to generate card data.</p>"
@@ -787,6 +792,10 @@
           "shape":"NumberLengthBetween12And19",
           "documentation":"<p>The Primary Account Number (PAN), a unique identifier for a payment credit or debit card that associates the card with a specific account holder.</p>"
         },
+        "GenerationAttributes":{
+          "shape":"CardGenerationAttributes",
+          "documentation":"<p>The algorithm for generating CVV or CSC values for the card within Amazon Web Services Payment Cryptography.</p>"
+        },
         "ValidationDataLength":{
           "shape":"IntegerRangeBetween3And5Type",
           "documentation":"<p>The length of the CVV or CSC to be generated. The default value is 3.</p>"
@@ -818,26 +827,26 @@
     "GenerateMacInput":{
       "type":"structure",
       "required":[
-        "GenerationAttributes",
         "KeyIdentifier",
-        "MessageData"
+        "MessageData",
+        "GenerationAttributes"
       ],
       "members":{
-        "GenerationAttributes":{
-          "shape":"MacAttributes",
-          "documentation":"<p>The attributes and data values to use for MAC generation within Amazon Web Services Payment Cryptography.</p>"
-        },
         "KeyIdentifier":{
           "shape":"KeyArnOrKeyAliasType",
           "documentation":"<p>The <code>keyARN</code> of the MAC generation encryption key.</p>"
         },
-        "MacLength":{
-          "shape":"IntegerRangeBetween4And16",
-          "documentation":"<p>The length of a MAC under generation.</p>"
-        },
         "MessageData":{
           "shape":"HexEvenLengthBetween2And4096",
           "documentation":"<p>The data for which a MAC is under generation. This value must be hexBinary.</p>"
+        },
+        "GenerationAttributes":{
+          "shape":"MacAttributes",
+          "documentation":"<p>The attributes and data values to use for MAC generation within Amazon Web Services Payment Cryptography.</p>"
+        },
+        "MacLength":{
+          "shape":"IntegerRangeBetween4And16",
+          "documentation":"<p>The length of a MAC under generation.</p>"
         }
       }
     },
@@ -866,13 +875,17 @@
     "GeneratePinDataInput":{
       "type":"structure",
       "required":[
+        "GenerationKeyIdentifier",
         "EncryptionKeyIdentifier",
         "GenerationAttributes",
-        "GenerationKeyIdentifier",
-        "PinBlockFormat",
-        "PrimaryAccountNumber"
+        "PrimaryAccountNumber",
+        "PinBlockFormat"
       ],
       "members":{
+        "GenerationKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment Cryptography uses for pin data generation.</p>"
+        },
         "EncryptionKeyIdentifier":{
           "shape":"KeyArnOrKeyAliasType",
           "documentation":"<p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment Cryptography uses to encrypt the PIN Block.</p>"
@@ -881,14 +894,6 @@
           "shape":"PinGenerationAttributes",
           "documentation":"<p>The attributes and values to use for PIN, PVV, or PIN Offset generation.</p>"
         },
-        "GenerationKeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment Cryptography uses for pin data generation.</p>"
-        },
-        "PinBlockFormat":{
-          "shape":"PinBlockFormatForPinData",
-          "documentation":"<p>The PIN encoding format for pin data generation as specified in ISO 9564. Amazon Web Services Payment Cryptography supports <code>ISO_Format_0</code> and <code>ISO_Format_3</code>.</p> <p>The <code>ISO_Format_0</code> PIN block format is equivalent to the ANSI X9.8, VISA-1, and ECI-1 PIN block formats. It is similar to a VISA-4 PIN block format. It supports a PIN from 4 to 12 digits in length.</p> <p>The <code>ISO_Format_3</code> PIN block format is the same as <code>ISO_Format_0</code> except that the fill digits are random values from 10 to 15.</p>"
-        },
         "PinDataLength":{
           "shape":"IntegerRangeBetween4And12",
           "documentation":"<p>The length of PIN under generation.</p>"
@@ -896,40 +901,44 @@
         "PrimaryAccountNumber":{
           "shape":"NumberLengthBetween12And19",
           "documentation":"<p>The Primary Account Number (PAN), a unique identifier for a payment credit or debit card that associates the card with a specific account holder.</p>"
+        },
+        "PinBlockFormat":{
+          "shape":"PinBlockFormatForPinData",
+          "documentation":"<p>The PIN encoding format for pin data generation as specified in ISO 9564. Amazon Web Services Payment Cryptography supports <code>ISO_Format_0</code> and <code>ISO_Format_3</code>.</p> <p>The <code>ISO_Format_0</code> PIN block format is equivalent to the ANSI X9.8, VISA-1, and ECI-1 PIN block formats. It is similar to a VISA-4 PIN block format. It supports a PIN from 4 to 12 digits in length.</p> <p>The <code>ISO_Format_3</code> PIN block format is the same as <code>ISO_Format_0</code> except that the fill digits are random values from 10 to 15.</p>"
         }
       }
     },
     "GeneratePinDataOutput":{
       "type":"structure",
       "required":[
-        "EncryptedPinBlock",
-        "EncryptionKeyArn",
-        "EncryptionKeyCheckValue",
         "GenerationKeyArn",
         "GenerationKeyCheckValue",
+        "EncryptionKeyArn",
+        "EncryptionKeyCheckValue",
+        "EncryptedPinBlock",
         "PinData"
       ],
       "members":{
-        "EncryptedPinBlock":{
-          "shape":"HexLengthBetween16And32",
-          "documentation":"<p>The PIN block encrypted under PEK from Amazon Web Services Payment Cryptography. The encrypted PIN block is a composite of PAN (Primary Account Number) and PIN (Personal Identification Number), generated in accordance with ISO 9564 standard.</p>"
-        },
-        "EncryptionKeyArn":{
+        "GenerationKeyArn":{
           "shape":"KeyArn",
-          "documentation":"<p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment Cryptography uses for encrypted pin block generation.</p>"
+          "documentation":"<p>The <code>keyARN</code> of the pin data generation key that Amazon Web Services Payment Cryptography uses for PIN, PVV or PIN Offset generation.</p>"
         },
-        "EncryptionKeyCheckValue":{
+        "GenerationKeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
         },
-        "GenerationKeyArn":{
+        "EncryptionKeyArn":{
           "shape":"KeyArn",
-          "documentation":"<p>The <code>keyARN</code> of the pin data generation key that Amazon Web Services Payment Cryptography uses for PIN, PVV or PIN Offset generation.</p>"
+          "documentation":"<p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment Cryptography uses for encrypted pin block generation.</p>"
         },
-        "GenerationKeyCheckValue":{
+        "EncryptionKeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
         },
+        "EncryptedPinBlock":{
+          "shape":"HexLengthBetween16And32",
+          "documentation":"<p>The PIN block encrypted under PEK from Amazon Web Services Payment Cryptography. The encrypted PIN block is a composite of PAN (Primary Account Number) and PIN (Personal Identification Number), generated in accordance with ISO 9564 standard.</p>"
+        },
         "PinData":{
           "shape":"PinData",
           "documentation":"<p>The attributes and values Amazon Web Services Payment Cryptography uses for pin data generation.</p>"
@@ -940,142 +949,136 @@
       "type":"string",
       "max":32,
       "min":16,
-      "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$",
+      "pattern":"(?:[0-9a-fA-F][0-9a-fA-F])+",
       "sensitive":true
     },
     "HexEvenLengthBetween16And4064":{
       "type":"string",
       "max":4064,
       "min":16,
-      "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$",
+      "pattern":"(?:[0-9a-fA-F][0-9a-fA-F])+",
       "sensitive":true
     },
     "HexEvenLengthBetween16And4096":{
       "type":"string",
       "max":4096,
       "min":16,
-      "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$",
+      "pattern":"(?:[0-9a-fA-F][0-9a-fA-F])+",
       "sensitive":true
     },
     "HexEvenLengthBetween2And4096":{
       "type":"string",
       "max":4096,
       "min":2,
-      "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$",
+      "pattern":"(?:[0-9a-fA-F][0-9a-fA-F])+",
       "sensitive":true
     },
     "HexEvenLengthBetween4And128":{
       "type":"string",
       "max":128,
       "min":4,
-      "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$",
+      "pattern":"(?:[0-9a-fA-F][0-9a-fA-F])+",
       "sensitive":true
     },
     "HexLength16Or32":{
       "type":"string",
       "max":32,
       "min":16,
-      "pattern":"^(?:[0-9a-fA-F]{16}|[0-9a-fA-F]{32})$",
+      "pattern":"(?:[0-9a-fA-F]{16}|[0-9a-fA-F]{32})",
       "sensitive":true
     },
     "HexLengthBetween10And24":{
       "type":"string",
       "max":24,
       "min":10,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthBetween16And32":{
       "type":"string",
       "max":32,
       "min":16,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthBetween1And16":{
       "type":"string",
       "max":16,
       "min":1,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthBetween2And1024":{
       "type":"string",
       "max":1024,
       "min":2,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthBetween2And160":{
       "type":"string",
       "max":160,
       "min":2,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthBetween2And4":{
       "type":"string",
       "max":4,
       "min":2,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthBetween2And8":{
       "type":"string",
       "max":8,
       "min":2,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthBetween4And128":{
       "type":"string",
       "max":128,
       "min":4,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthEquals1":{
       "type":"string",
       "max":1,
       "min":1,
-      "pattern":"^[0-9A-F]+$"
+      "pattern":"[0-9A-F]+"
     },
     "HexLengthEquals16":{
       "type":"string",
       "max":16,
       "min":16,
-      "pattern":"^[0-9a-fA-F]+$"
-    },
-    "HexLengthEquals2":{
-      "type":"string",
-      "max":2,
-      "min":2,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthEquals4":{
       "type":"string",
       "max":4,
       "min":4,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "HexLengthEquals8":{
       "type":"string",
       "max":8,
       "min":8,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
     },
     "Ibm3624NaturalPin":{
       "type":"structure",
       "required":[
         "DecimalizationTable",
-        "PinValidationData",
-        "PinValidationDataPadCharacter"
+        "PinValidationDataPadCharacter",
+        "PinValidationData"
       ],
       "members":{
         "DecimalizationTable":{
           "shape":"NumberLengthEquals16",
           "documentation":"<p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used to convert the algorithm intermediate result from hexadecimal characters to decimal.</p>"
         },
-        "PinValidationData":{
-          "shape":"NumberLengthBetween4And16",
-          "documentation":"<p>The unique data for cardholder identification.</p>"
-        },
         "PinValidationDataPadCharacter":{
           "shape":"HexLengthEquals1",
           "documentation":"<p>The padding character for validation data.</p>"
-        }
+        },
+        "PinValidationData":{
+          "shape":"NumberLengthBetween4And16",
+          "documentation":"<p>The unique data for cardholder identification.</p>"
+        }
       },
       "documentation":"<p>Parameters that are required to generate or verify Ibm3624 natural PIN.</p>"
     },
@@ -1083,26 +1086,26 @@
       "type":"structure",
       "required":[
         "DecimalizationTable",
-        "PinOffset",
+        "PinValidationDataPadCharacter",
         "PinValidationData",
-        "PinValidationDataPadCharacter"
+        "PinOffset"
       ],
       "members":{
         "DecimalizationTable":{
           "shape":"NumberLengthEquals16",
           "documentation":"<p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used to convert the algorithm intermediate result from hexadecimal characters to decimal.</p>"
         },
-        "PinOffset":{
-          "shape":"NumberLengthBetween4And12",
-          "documentation":"<p>The PIN offset value.</p>"
+        "PinValidationDataPadCharacter":{
+          "shape":"HexLengthEquals1",
+          "documentation":"<p>The padding character for validation data.</p>"
         },
         "PinValidationData":{
           "shape":"NumberLengthBetween4And16",
           "documentation":"<p>The unique data for cardholder identification.</p>"
         },
-        "PinValidationDataPadCharacter":{
-          "shape":"HexLengthEquals1",
-          "documentation":"<p>The padding character for validation data.</p>"
+        "PinOffset":{
+          "shape":"NumberLengthBetween4And12",
+          "documentation":"<p>The PIN offset value.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to generate or verify Ibm3624 PIN from offset PIN.</p>"
@@ -1110,27 +1113,27 @@
     "Ibm3624PinOffset":{
       "type":"structure",
       "required":[
-        "DecimalizationTable",
         "EncryptedPinBlock",
-        "PinValidationData",
-        "PinValidationDataPadCharacter"
+        "DecimalizationTable",
+        "PinValidationDataPadCharacter",
+        "PinValidationData"
       ],
       "members":{
-        "DecimalizationTable":{
-          "shape":"NumberLengthEquals16",
-          "documentation":"<p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used to convert the algorithm intermediate result from hexadecimal characters to decimal.</p>"
-        },
         "EncryptedPinBlock":{
           "shape":"HexLengthBetween16And32",
           "documentation":"<p>The encrypted PIN block data. According to ISO 9564 standard, a PIN Block is an encoded representation of a payment card Personal Account Number (PAN) and the cardholder Personal Identification Number (PIN).</p>"
         },
-        "PinValidationData":{
-          "shape":"NumberLengthBetween4And16",
-          "documentation":"<p>The unique data for cardholder identification.</p>"
+        "DecimalizationTable":{
+          "shape":"NumberLengthEquals16",
+          "documentation":"<p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used to convert the algorithm intermediate result from hexadecimal characters to decimal.</p>"
         },
         "PinValidationDataPadCharacter":{
           "shape":"HexLengthEquals1",
           "documentation":"<p>The padding character for validation data.</p>"
+        },
+        "PinValidationData":{
+          "shape":"NumberLengthBetween4And16",
+          "documentation":"<p>The unique data for cardholder identification.</p>"
         }
       },
       "documentation":"<p>Pparameters that are required to generate or verify Ibm3624 PIN offset PIN.</p>"
@@ -1139,26 +1142,26 @@
       "type":"structure",
       "required":[
         "DecimalizationTable",
-        "PinOffset",
+        "PinValidationDataPadCharacter",
         "PinValidationData",
-        "PinValidationDataPadCharacter"
+        "PinOffset"
       ],
       "members":{
         "DecimalizationTable":{
           "shape":"NumberLengthEquals16",
           "documentation":"<p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used to convert the algorithm intermediate result from hexadecimal characters to decimal.</p>"
         },
-        "PinOffset":{
-          "shape":"NumberLengthBetween4And12",
-          "documentation":"<p>The PIN offset value.</p>"
+        "PinValidationDataPadCharacter":{
+          "shape":"HexLengthEquals1",
+          "documentation":"<p>The padding character for validation data.</p>"
         },
         "PinValidationData":{
           "shape":"NumberLengthBetween4And16",
           "documentation":"<p>The unique data for cardholder identification.</p>"
         },
-        "PinValidationDataPadCharacter":{
-          "shape":"HexLengthEquals1",
-          "documentation":"<p>The padding character for validation data.</p>"
+        "PinOffset":{
+          "shape":"NumberLengthBetween4And12",
+          "documentation":"<p>The PIN offset value.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to generate or verify Ibm3624 PIN verification PIN.</p>"
@@ -1167,29 +1170,29 @@
       "type":"structure",
       "required":[
         "DecimalizationTable",
-        "PinValidationData",
-        "PinValidationDataPadCharacter"
+        "PinValidationDataPadCharacter",
+        "PinValidationData"
       ],
       "members":{
         "DecimalizationTable":{
           "shape":"NumberLengthEquals16",
           "documentation":"<p>The decimalization table to use for IBM 3624 PIN algorithm. The table is used to convert the algorithm intermediate result from hexadecimal characters to decimal.</p>"
         },
-        "PinValidationData":{
-          "shape":"NumberLengthBetween4And16",
-          "documentation":"<p>The unique data for cardholder identification.</p>"
-        },
         "PinValidationDataPadCharacter":{
           "shape":"HexLengthEquals1",
           "documentation":"<p>The padding character for validation data.</p>"
+        },
+        "PinValidationData":{
+          "shape":"NumberLengthBetween4And16",
+          "documentation":"<p>The unique data for cardholder identification.</p>"
         }
       },
       "documentation":"<p>Parameters that are required to generate or verify Ibm3624 random PIN.</p>"
     },
-    "IntegerRangeBetween0And9":{
+    "IntegerRangeBetween0And6":{
       "type":"integer",
       "box":true,
-      "max":9,
+      "max":6,
       "min":0
     },
     "IntegerRangeBetween3And5Type":{
@@ -1224,19 +1227,26 @@
       "type":"string",
       "max":150,
       "min":70,
-      "pattern":"^arn:aws:payment-cryptography:[a-z]{2}-[a-z]{1,16}-[0-9]+:[0-9]{12}:key/[0-9a-zA-Z]{16,64}$"
+      "pattern":"arn:aws:payment-cryptography:[a-z]{2}-[a-z]{1,16}-[0-9]+:[0-9]{12}:key/[0-9a-zA-Z]{16,64}"
     },
     "KeyArnOrKeyAliasType":{
       "type":"string",
       "max":322,
       "min":7,
-      "pattern":"^arn:aws:payment-cryptography:[a-z]{2}-[a-z]{1,16}-[0-9]+:[0-9]{12}:(key/[0-9a-zA-Z]{16,64}|alias/[a-zA-Z0-9/_-]+)$|^alias/[a-zA-Z0-9/_-]+$"
+      "pattern":"arn:aws:payment-cryptography:[a-z]{2}-[a-z]{1,16}-[0-9]+:[0-9]{12}:(key/[0-9a-zA-Z]{16,64}|alias/[a-zA-Z0-9/_-]+)$|^alias/[a-zA-Z0-9/_-]+"
     },
     "KeyCheckValue":{
       "type":"string",
       "max":16,
       "min":4,
-      "pattern":"^[0-9a-fA-F]+$"
+      "pattern":"[0-9a-fA-F]+"
+    },
+    "KeyCheckValueAlgorithm":{
+      "type":"string",
+      "enum":[
+        "CMAC",
+        "ANSI_X9_24"
+      ]
     },
     "MacAlgorithm":{
       "type":"string",
@@ -1253,21 +1263,21 @@
     "MacAlgorithmDukpt":{
       "type":"structure",
       "required":[
-        "DukptKeyVariant",
-        "KeySerialNumber"
+        "KeySerialNumber",
+        "DukptKeyVariant"
       ],
       "members":{
-        "DukptDerivationType":{
-          "shape":"DukptDerivationType",
-          "documentation":"<p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key Serial Number (KSN). This must be less than or equal to the strength of the BDK. For example, you can't use <code>AES_128</code> as a derivation type for a BDK of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>"
+        "KeySerialNumber":{
+          "shape":"HexLengthBetween10And24",
+          "documentation":"<p>The unique identifier known as Key Serial Number (KSN) that comes from an encrypting device using DUKPT encryption method. The KSN is derived from the encrypting device unique identifier and an internal transaction counter.</p>"
         },
         "DukptKeyVariant":{
           "shape":"DukptKeyVariant",
           "documentation":"<p>The type of use of DUKPT, which can be MAC generation, MAC verification, or both.</p>"
         },
-        "KeySerialNumber":{
-          "shape":"HexLengthBetween10And24",
-          "documentation":"<p>The unique identifier known as Key Serial Number (KSN) that comes from an encrypting device using DUKPT encryption method. The KSN is derived from the encrypting device unique identifier and an internal transaction counter.</p>"
+        "DukptDerivationType":{
+          "shape":"DukptDerivationType",
+          "documentation":"<p>The key type derived using DUKPT from a Base Derivation Key (BDK) and Key Serial Number (KSN). This must be less than or equal to the strength of the BDK. For example, you can't use <code>AES_128</code> as a derivation type for a BDK of <code>AES_128</code> or <code>TDES_2KEY</code>.</p>"
         }
       },
       "documentation":"<p>Parameters required for DUKPT MAC generation and verification.</p>"
@@ -1276,8 +1286,8 @@
       "type":"structure",
       "required":[
         "MajorKeyDerivationMode",
-        "PanSequenceNumber",
         "PrimaryAccountNumber",
+        "PanSequenceNumber",
         "SessionKeyDerivationMode",
         "SessionKeyDerivationValue"
       ],
@@ -1286,14 +1296,14 @@
           "shape":"MajorKeyDerivationMode",
           "documentation":"<p>The method to use when deriving the master key for EMV MAC generation or verification.</p>"
         },
-        "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
-          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
-        },
         "PrimaryAccountNumber":{
           "shape":"NumberLengthBetween12And19",
           "documentation":"<p>The Primary Account Number (PAN), a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
         },
+        "PanSequenceNumber":{
+          "shape":"NumberLengthEquals2",
+          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
+        },
         "SessionKeyDerivationMode":{
           "shape":"SessionKeyDerivationMode",
           "documentation":"<p>The method of deriving a session key for EMV MAC generation or verification.</p>"
@@ -1312,9 +1322,9 @@
           "shape":"MacAlgorithm",
           "documentation":"<p>The encryption algorithm for MAC generation or verification.</p>"
         },
-        "DukptCmac":{
-          "shape":"MacAlgorithmDukpt",
-          "documentation":"<p>Parameters that are required for MAC generation or verification using DUKPT CMAC algorithm.</p>"
+        "EmvMac":{
+          "shape":"MacAlgorithmEmv",
+          "documentation":"<p>Parameters that are required for MAC generation or verification using EMV MAC algorithm.</p>"
         },
         "DukptIso9797Algorithm1":{
           "shape":"MacAlgorithmDukpt",
@@ -1324,9 +1334,9 @@
           "shape":"MacAlgorithmDukpt",
           "documentation":"<p>Parameters that are required for MAC generation or verification using DUKPT ISO 9797 algorithm3.</p>"
         },
-        "EmvMac":{
-          "shape":"MacAlgorithmEmv",
-          "documentation":"<p>Parameters that are required for MAC generation or verification using EMV MAC algorithm.</p>"
+        "DukptCmac":{
+          "shape":"MacAlgorithmDukpt",
+          "documentation":"<p>Parameters that are required for MAC generation or verification using DUKPT CMAC algorithm.</p>"
         }
       },
       "documentation":"<p>Parameters that are required for DUKPT, HMAC, or EMV MAC generation or verification.</p>",
@@ -1343,44 +1353,50 @@
       "type":"string",
       "max":19,
       "min":12,
-      "pattern":"^[0-9]+$",
+      "pattern":"[0-9]+",
       "sensitive":true
     },
     "NumberLengthBetween3And5":{
       "type":"string",
       "max":5,
       "min":3,
-      "pattern":"^[0-9]+$"
+      "pattern":"[0-9]+"
     },
     "NumberLengthBetween4And12":{
       "type":"string",
       "max":12,
       "min":4,
-      "pattern":"^[0-9]+$"
+      "pattern":"[0-9]+"
     },
     "NumberLengthBetween4And16":{
       "type":"string",
       "max":16,
       "min":4,
-      "pattern":"^[0-9]+$"
+      "pattern":"[0-9]+"
     },
     "NumberLengthEquals16":{
       "type":"string",
       "max":16,
       "min":16,
-      "pattern":"^[0-9]+$"
+      "pattern":"[0-9]+"
+    },
+    "NumberLengthEquals2":{
+      "type":"string",
+      "max":2,
+      "min":2,
+      "pattern":"[0-9]+"
     },
     "NumberLengthEquals3":{
       "type":"string",
       "max":3,
       "min":3,
-      "pattern":"^[0-9]+$"
+      "pattern":"[0-9]+"
     },
     "NumberLengthEquals4":{
       "type":"string",
       "max":4,
       "min":4,
-      "pattern":"^[0-9]+$"
+      "pattern":"[0-9]+"
     },
     "PaddingType":{
       "type":"string",
@@ -1416,29 +1432,29 @@
     "PinGenerationAttributes":{
       "type":"structure",
       "members":{
-        "Ibm3624NaturalPin":{
-          "shape":"Ibm3624NaturalPin",
-          "documentation":"<p>Parameters that are required to generate or verify Ibm3624 natural PIN.</p>"
+        "VisaPin":{
+          "shape":"VisaPin",
+          "documentation":"<p>Parameters that are required to generate or verify Visa PIN.</p>"
         },
-        "Ibm3624PinFromOffset":{
-          "shape":"Ibm3624PinFromOffset",
-          "documentation":"<p>Parameters that are required to generate or verify Ibm3624 PIN from offset PIN.</p>"
+        "VisaPinVerificationValue":{
+          "shape":"VisaPinVerificationValue",
+          "documentation":"<p>Parameters that are required to generate or verify Visa PIN Verification Value (PVV).</p>"
         },
         "Ibm3624PinOffset":{
           "shape":"Ibm3624PinOffset",
           "documentation":"<p>Parameters that are required to generate or verify Ibm3624 PIN offset PIN.</p>"
         },
+        "Ibm3624NaturalPin":{
+          "shape":"Ibm3624NaturalPin",
+          "documentation":"<p>Parameters that are required to generate or verify Ibm3624 natural PIN.</p>"
+        },
         "Ibm3624RandomPin":{
           "shape":"Ibm3624RandomPin",
           "documentation":"<p>Parameters that are required to generate or verify Ibm3624 random PIN.</p>"
         },
-        "VisaPin":{
-          "shape":"VisaPin",
-          "documentation":"<p>Parameters that are required to generate or verify Visa PIN.</p>"
-        },
-        "VisaPinVerificationValue":{
-          "shape":"VisaPinVerificationValue",
-          "documentation":"<p>Parameters that are required to generate or verify Visa PIN Verification Value (PVV).</p>"
+        "Ibm3624PinFromOffset":{
+          "shape":"Ibm3624PinFromOffset",
+          "documentation":"<p>Parameters that are required to generate or verify Ibm3624 PIN from offset PIN.</p>"
         }
       },
       "documentation":"<p>Parameters that are required for PIN data generation.</p>",
@@ -1447,13 +1463,13 @@
     "PinVerificationAttributes":{
       "type":"structure",
       "members":{
-        "Ibm3624Pin":{
-          "shape":"Ibm3624PinVerification",
-          "documentation":"<p>Parameters that are required to generate or verify Ibm3624 PIN.</p>"
-        },
         "VisaPin":{
           "shape":"VisaPinVerification",
           "documentation":"<p>Parameters that are required to generate or verify Visa PIN.</p>"
+        },
+        "Ibm3624Pin":{
+          "shape":"Ibm3624PinVerification",
+          "documentation":"<p>Parameters that are required to generate or verify Ibm3624 PIN.</p>"
         }
       },
       "documentation":"<p>Parameters that are required for PIN data verification.</p>",
@@ -1462,13 +1478,23 @@
     "ReEncryptDataInput":{
       "type":"structure",
       "required":[
+        "IncomingKeyIdentifier",
+        "OutgoingKeyIdentifier",
         "CipherText",
         "IncomingEncryptionAttributes",
-        "IncomingKeyIdentifier",
-        "OutgoingEncryptionAttributes",
-        "OutgoingKeyIdentifier"
+        "OutgoingEncryptionAttributes"
       ],
       "members":{
+        "IncomingKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the encryption key of incoming ciphertext data.</p> <p>When a WrappedKeyBlock is provided, this value will be the identifier to the key wrapping key. Otherwise, it is the key identifier used to perform the operation.</p>",
+          "location":"uri",
+          "locationName":"IncomingKeyIdentifier"
+        },
+        "OutgoingKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the encryption key of outgoing ciphertext data after encryption by Amazon Web Services Payment Cryptography.</p>"
+        },
         "CipherText":{
           "shape":"HexEvenLengthBetween16And4096",
           "documentation":"<p>Ciphertext to be encrypted. The minimum allowed length is 16 bytes and maximum allowed length is 4096 bytes.</p>"
@@ -1477,34 +1503,28 @@
           "shape":"ReEncryptionAttributes",
           "documentation":"<p>The attributes and values for incoming ciphertext.</p>"
         },
-        "IncomingKeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the encryption key of incoming ciphertext data.</p>",
-          "location":"uri",
-          "locationName":"IncomingKeyIdentifier"
-        },
         "OutgoingEncryptionAttributes":{
           "shape":"ReEncryptionAttributes",
           "documentation":"<p>The attributes and values for outgoing ciphertext data after encryption by Amazon Web Services Payment Cryptography.</p>"
         },
-        "OutgoingKeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the encryption key of outgoing ciphertext data after encryption by Amazon Web Services Payment Cryptography.</p>"
+        "IncomingWrappedKey":{
+          "shape":"WrappedKey",
+          "documentation":"<p>The WrappedKeyBlock containing the encryption key of incoming ciphertext data.</p>"
+        },
+        "OutgoingWrappedKey":{
+          "shape":"WrappedKey",
+          "documentation":"<p>The WrappedKeyBlock containing the encryption key of outgoing ciphertext data after encryption by Amazon Web Services Payment Cryptography.</p>"
         }
       }
     },
     "ReEncryptDataOutput":{
       "type":"structure",
       "required":[
-        "CipherText",
         "KeyArn",
-        "KeyCheckValue"
+        "KeyCheckValue",
+        "CipherText"
       ],
       "members":{
-        "CipherText":{
-          "shape":"HexEvenLengthBetween16And4096",
-          "documentation":"<p>The encrypted ciphertext.</p>"
-        },
         "KeyArn":{
           "shape":"KeyArn",
           "documentation":"<p>The keyARN (Amazon Resource Name) of the encryption key that Amazon Web Services Payment Cryptography uses for plaintext encryption.</p>"
@@ -1512,17 +1532,21 @@
         "KeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
+        },
+        "CipherText":{
+          "shape":"HexEvenLengthBetween16And4096",
+          "documentation":"<p>The encrypted ciphertext.</p>"
         }
       }
     },
     "ReEncryptionAttributes":{
       "type":"structure",
       "members":{
-        "Dukpt":{"shape":"DukptEncryptionAttributes"},
         "Symmetric":{
           "shape":"SymmetricEncryptionAttributes",
           "documentation":"<p>Parameters that are required to encrypt data using symmetric keys.</p>"
-        }
+        },
+        "Dukpt":{"shape":"DukptEncryptionAttributes"}
       },
       "documentation":"<p>Parameters that are required to perform reencryption operation.</p>",
       "union":true
@@ -1545,17 +1569,17 @@
     "SessionKeyAmex":{
       "type":"structure",
       "required":[
-        "PanSequenceNumber",
-        "PrimaryAccountNumber"
+        "PrimaryAccountNumber",
+        "PanSequenceNumber"
       ],
       "members":{
-        "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
-          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
-        },
         "PrimaryAccountNumber":{
           "shape":"NumberLengthBetween12And19",
           "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
+        },
+        "PanSequenceNumber":{
+          "shape":"NumberLengthEquals2",
+          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         }
       },
       "documentation":"<p>Parameters to derive session key for an Amex payment card.</p>"
@@ -1563,14 +1587,6 @@
     "SessionKeyDerivation":{
       "type":"structure",
       "members":{
-        "Amex":{
-          "shape":"SessionKeyAmex",
-          "documentation":"<p>Parameters to derive session key for an Amex payment card for ARQC verification.</p>"
-        },
-        "Emv2000":{
-          "shape":"SessionKeyEmv2000",
-          "documentation":"<p>Parameters to derive session key for an Emv2000 payment card for ARQC verification.</p>"
-        },
         "EmvCommon":{
           "shape":"SessionKeyEmvCommon",
           "documentation":"<p>Parameters to derive session key for an Emv common payment card for ARQC verification.</p>"
@@ -1579,6 +1595,14 @@
           "shape":"SessionKeyMastercard",
           "documentation":"<p>Parameters to derive session key for a Mastercard payment card for ARQC verification.</p>"
         },
+        "Emv2000":{
+          "shape":"SessionKeyEmv2000",
+          "documentation":"<p>Parameters to derive session key for an Emv2000 payment card for ARQC verification.</p>"
+        },
+        "Amex":{
+          "shape":"SessionKeyAmex",
+          "documentation":"<p>Parameters to derive session key for an Amex payment card for ARQC verification.</p>"
+        },
         "Visa":{
           "shape":"SessionKeyVisa",
           "documentation":"<p>Parameters to derive session key for a Visa payment cardfor ARQC verification.</p>"
@@ -1615,22 +1639,22 @@
     "SessionKeyEmv2000":{
       "type":"structure",
       "required":[
-        "ApplicationTransactionCounter",
+        "PrimaryAccountNumber",
         "PanSequenceNumber",
-        "PrimaryAccountNumber"
+        "ApplicationTransactionCounter"
       ],
       "members":{
-        "ApplicationTransactionCounter":{
-          "shape":"HexLengthBetween2And4",
-          "documentation":"<p>The transaction counter that is provided by the terminal during transaction processing.</p>"
+        "PrimaryAccountNumber":{
+          "shape":"NumberLengthBetween12And19",
+          "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
         },
         "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
+          "shape":"NumberLengthEquals2",
           "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         },
-        "PrimaryAccountNumber":{
-          "shape":"NumberLengthBetween12And19",
-          "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
+        "ApplicationTransactionCounter":{
+          "shape":"HexLengthBetween2And4",
+          "documentation":"<p>The transaction counter that is provided by the terminal during transaction processing.</p>"
         }
       },
       "documentation":"<p>Parameters to derive session key for an Emv2000 payment card for ARQC verification.</p>"
@@ -1638,22 +1662,22 @@
     "SessionKeyEmvCommon":{
       "type":"structure",
       "required":[
-        "ApplicationTransactionCounter",
+        "PrimaryAccountNumber",
         "PanSequenceNumber",
-        "PrimaryAccountNumber"
+        "ApplicationTransactionCounter"
       ],
       "members":{
-        "ApplicationTransactionCounter":{
-          "shape":"HexLengthBetween2And4",
-          "documentation":"<p>The transaction counter that is provided by the terminal during transaction processing.</p>"
+        "PrimaryAccountNumber":{
+          "shape":"NumberLengthBetween12And19",
+          "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
         },
         "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
+          "shape":"NumberLengthEquals2",
           "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         },
-        "PrimaryAccountNumber":{
-          "shape":"NumberLengthBetween12And19",
-          "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
+        "ApplicationTransactionCounter":{
+          "shape":"HexLengthBetween2And4",
+          "documentation":"<p>The transaction counter that is provided by the terminal during transaction processing.</p>"
         }
       },
       "documentation":"<p>Parameters to derive session key for an Emv common payment card for ARQC verification.</p>"
@@ -1661,23 +1685,23 @@
     "SessionKeyMastercard":{
       "type":"structure",
       "required":[
-        "ApplicationTransactionCounter",
-        "PanSequenceNumber",
         "PrimaryAccountNumber",
+        "PanSequenceNumber",
+        "ApplicationTransactionCounter",
         "UnpredictableNumber"
       ],
       "members":{
-        "ApplicationTransactionCounter":{
-          "shape":"HexLengthBetween2And4",
-          "documentation":"<p>The transaction counter that is provided by the terminal during transaction processing.</p>"
+        "PrimaryAccountNumber":{
+          "shape":"NumberLengthBetween12And19",
+          "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
         },
         "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
+          "shape":"NumberLengthEquals2",
           "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         },
-        "PrimaryAccountNumber":{
-          "shape":"NumberLengthBetween12And19",
-          "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
+        "ApplicationTransactionCounter":{
+          "shape":"HexLengthBetween2And4",
+          "documentation":"<p>The transaction counter that is provided by the terminal during transaction processing.</p>"
         },
         "UnpredictableNumber":{
           "shape":"HexLengthBetween2And8",
@@ -1689,17 +1713,17 @@
     "SessionKeyVisa":{
       "type":"structure",
       "required":[
-        "PanSequenceNumber",
-        "PrimaryAccountNumber"
+        "PrimaryAccountNumber",
+        "PanSequenceNumber"
       ],
       "members":{
-        "PanSequenceNumber":{
-          "shape":"HexLengthEquals2",
-          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
-        },
         "PrimaryAccountNumber":{
           "shape":"NumberLengthBetween12And19",
           "documentation":"<p>The Primary Account Number (PAN) of the cardholder. A PAN is a unique identifier for a payment credit or debit card and associates the card to a specific account holder.</p>"
+        },
+        "PanSequenceNumber":{
+          "shape":"NumberLengthEquals2",
+          "documentation":"<p>A number that identifies and differentiates payment cards with the same Primary Account Number (PAN).</p>"
         }
       },
       "documentation":"<p>Parameters to derive session key for Visa payment card for ARQC verification.</p>"
@@ -1709,14 +1733,14 @@
       "type":"structure",
       "required":["Mode"],
       "members":{
-        "InitializationVector":{
-          "shape":"HexLength16Or32",
-          "documentation":"<p>An input used to provide the intial state. If no value is provided, Amazon Web Services Payment Cryptography defaults it to zero.</p>"
-        },
         "Mode":{
           "shape":"EncryptionMode",
           "documentation":"<p>The block cipher method to use for encryption.</p>"
         },
+        "InitializationVector":{
+          "shape":"HexLength16Or32",
+          "documentation":"<p>An input used to provide the intial state. If no value is provided, Amazon Web Services Payment Cryptography defaults it to zero.</p>"
+        },
         "PaddingType":{
           "shape":"PaddingType",
           "documentation":"<p>The padding to be included with the data.</p>"
@@ -1736,16 +1760,39 @@
       },
       "exception":true
     },
+    "Tr31WrappedKeyBlock":{
+      "type":"string",
+      "max":9984,
+      "min":56,
+      "pattern":"[0-9A-Z]+",
+      "sensitive":true
+    },
     "TranslatePinDataInput":{
       "type":"structure",
       "required":[
-        "EncryptedPinBlock",
         "IncomingKeyIdentifier",
-        "IncomingTranslationAttributes",
         "OutgoingKeyIdentifier",
-        "OutgoingTranslationAttributes"
+        "IncomingTranslationAttributes",
+        "OutgoingTranslationAttributes",
+        "EncryptedPinBlock"
       ],
       "members":{
+        "IncomingKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the encryption key under which incoming PIN block data is encrypted. This key type can be PEK or BDK.</p> <p>When a WrappedKeyBlock is provided, this value will be the identifier to the key wrapping key for PIN block. Otherwise, it is the key identifier used to perform the operation.</p>"
+        },
+        "OutgoingKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the encryption key for encrypting outgoing PIN block data. This key type can be PEK or BDK.</p>"
+        },
+        "IncomingTranslationAttributes":{
+          "shape":"TranslationIsoFormats",
+          "documentation":"<p>The format of the incoming PIN block data for translation within Amazon Web Services Payment Cryptography.</p>"
+        },
+        "OutgoingTranslationAttributes":{
+          "shape":"TranslationIsoFormats",
+          "documentation":"<p>The format of the outgoing PIN block data after translation by Amazon Web Services Payment Cryptography.</p>"
+        },
         "EncryptedPinBlock":{
           "shape":"HexEvenLengthBetween16And32",
           "documentation":"<p>The encrypted PIN block data that Amazon Web Services Payment Cryptography translates.</p>"
@@ -1754,36 +1801,32 @@
           "shape":"DukptDerivationAttributes",
           "documentation":"<p>The attributes and values to use for incoming DUKPT encryption key for PIN block translation.</p>"
         },
-        "IncomingKeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the encryption key under which incoming PIN block data is encrypted. This key type can be PEK or BDK.</p>"
-        },
-        "IncomingTranslationAttributes":{
-          "shape":"TranslationIsoFormats",
-          "documentation":"<p>The format of the incoming PIN block data for translation within Amazon Web Services Payment Cryptography.</p>"
-        },
         "OutgoingDukptAttributes":{
           "shape":"DukptDerivationAttributes",
           "documentation":"<p>The attributes and values to use for outgoing DUKPT encryption key after PIN block translation.</p>"
         },
-        "OutgoingKeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the encryption key for encrypting outgoing PIN block data. This key type can be PEK or BDK.</p>"
+        "IncomingWrappedKey":{
+          "shape":"WrappedKey",
+          "documentation":"<p>The WrappedKeyBlock containing the encryption key under which incoming PIN block data is encrypted.</p>"
         },
-        "OutgoingTranslationAttributes":{
-          "shape":"TranslationIsoFormats",
-          "documentation":"<p>The format of the outgoing PIN block data after translation by Amazon Web Services Payment Cryptography.</p>"
+        "OutgoingWrappedKey":{
+          "shape":"WrappedKey",
+          "documentation":"<p>The WrappedKeyBlock containing the encryption key for encrypting outgoing PIN block data.</p>"
         }
       }
     },
     "TranslatePinDataOutput":{
       "type":"structure",
       "required":[
+        "PinBlock",
         "KeyArn",
-        "KeyCheckValue",
-        "PinBlock"
+        "KeyCheckValue"
       ],
       "members":{
+        "PinBlock":{
+          "shape":"HexLengthBetween16And32",
+          "documentation":"<p>The outgoing encrypted PIN block data after translation.</p>"
+        },
         "KeyArn":{
           "shape":"KeyArn",
           "documentation":"<p>The <code>keyARN</code> of the encryption key that Amazon Web Services Payment Cryptography uses to encrypt outgoing PIN block data after translation.</p>"
@@ -1791,10 +1834,6 @@
         "KeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
-        },
-        "PinBlock":{
-          "shape":"HexLengthBetween16And32",
-          "documentation":"<p>The outgoing encrypted PIN block data after translation.</p>"
         }
       }
     },
@@ -1842,11 +1881,11 @@
       "type":"structure",
       "required":["message"],
       "members":{
+        "message":{"shape":"String"},
         "fieldList":{
           "shape":"ValidationExceptionFieldList",
           "documentation":"<p>The request was denied due to an invalid request error.</p>"
-        },
-        "message":{"shape":"String"}
+        }
       },
       "documentation":"<p>The request was denied due to an invalid request error.</p>",
       "exception":true
@@ -1854,15 +1893,15 @@
     "ValidationExceptionField":{
       "type":"structure",
       "required":[
-        "message",
-        "path"
+        "path",
+        "message"
       ],
       "members":{
-        "message":{
+        "path":{
           "shape":"String",
           "documentation":"<p>The request was denied due to an invalid request error.</p>"
         },
-        "path":{
+        "message":{
           "shape":"String",
           "documentation":"<p>The request was denied due to an invalid request error.</p>"
         }
@@ -1876,15 +1915,15 @@
     "VerificationFailedException":{
       "type":"structure",
       "required":[
-        "Message",
-        "Reason"
+        "Reason",
+        "Message"
       ],
       "members":{
-        "Message":{"shape":"String"},
         "Reason":{
           "shape":"VerificationFailedReason",
           "documentation":"<p>The reason for the exception.</p>"
-        }
+        },
+        "Message":{"shape":"String"}
       },
       "documentation":"<p>This request failed verification.</p>",
       "error":{
@@ -1905,25 +1944,25 @@
     "VerifyAuthRequestCryptogramInput":{
       "type":"structure",
       "required":[
-        "AuthRequestCryptogram",
         "KeyIdentifier",
+        "TransactionData",
+        "AuthRequestCryptogram",
         "MajorKeyDerivationMode",
-        "SessionKeyDerivationAttributes",
-        "TransactionData"
+        "SessionKeyDerivationAttributes"
       ],
       "members":{
-        "AuthRequestCryptogram":{
-          "shape":"HexLengthEquals16",
-          "documentation":"<p>The auth request cryptogram imported into Amazon Web Services Payment Cryptography for ARQC verification using a major encryption key and transaction data.</p>"
-        },
-        "AuthResponseAttributes":{
-          "shape":"CryptogramAuthResponse",
-          "documentation":"<p>The attributes and values for auth request cryptogram verification. These parameters are required in case using ARPC Method 1 or Method 2 for ARQC verification.</p>"
-        },
         "KeyIdentifier":{
           "shape":"KeyArnOrKeyAliasType",
           "documentation":"<p>The <code>keyARN</code> of the major encryption key that Amazon Web Services Payment Cryptography uses for ARQC verification.</p>"
         },
+        "TransactionData":{
+          "shape":"HexLengthBetween2And1024",
+          "documentation":"<p>The transaction data that Amazon Web Services Payment Cryptography uses for ARQC verification. The same transaction is used for ARQC generation outside of Amazon Web Services Payment Cryptography.</p>"
+        },
+        "AuthRequestCryptogram":{
+          "shape":"HexLengthEquals16",
+          "documentation":"<p>The auth request cryptogram imported into Amazon Web Services Payment Cryptography for ARQC verification using a major encryption key and transaction data.</p>"
+        },
         "MajorKeyDerivationMode":{
           "shape":"MajorKeyDerivationMode",
           "documentation":"<p>The method to use when deriving the major encryption key for ARQC verification within Amazon Web Services Payment Cryptography. The same key derivation mode was used for ARQC generation outside of Amazon Web Services Payment Cryptography.</p>"
@@ -1932,9 +1971,9 @@
           "shape":"SessionKeyDerivation",
           "documentation":"<p>The attributes and values to use for deriving a session key for ARQC verification within Amazon Web Services Payment Cryptography. The same attributes were used for ARQC generation outside of Amazon Web Services Payment Cryptography.</p>"
         },
-        "TransactionData":{
-          "shape":"HexLengthBetween2And1024",
-          "documentation":"<p>The transaction data that Amazon Web Services Payment Cryptography uses for ARQC verification. The same transaction is used for ARQC generation outside of Amazon Web Services Payment Cryptography.</p>"
+        "AuthResponseAttributes":{
+          "shape":"CryptogramAuthResponse",
+          "documentation":"<p>The attributes and values for auth request cryptogram verification. These parameters are required in case using ARPC Method 1 or Method 2 for ARQC verification.</p>"
         }
       }
     },
@@ -1945,10 +1984,6 @@
         "KeyCheckValue"
       ],
       "members":{
-        "AuthResponseValue":{
-          "shape":"HexLengthBetween1And16",
-          "documentation":"<p>The result for ARQC verification or ARPC generation within Amazon Web Services Payment Cryptography.</p>"
-        },
         "KeyArn":{
           "shape":"KeyArn",
           "documentation":"<p>The <code>keyARN</code> of the major encryption key that Amazon Web Services Payment Cryptography uses for ARQC verification.</p>"
@@ -1956,6 +1991,10 @@
         "KeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
+        },
+        "AuthResponseValue":{
+          "shape":"HexLengthBetween1And16",
+          "documentation":"<p>The result for ARQC verification or ARPC generation within Amazon Web Services Payment Cryptography.</p>"
         }
       }
     },
@@ -1964,8 +2003,8 @@
       "required":[
         "KeyIdentifier",
         "PrimaryAccountNumber",
-        "ValidationData",
-        "VerificationAttributes"
+        "VerificationAttributes",
+        "ValidationData"
       ],
       "members":{
         "KeyIdentifier":{
@@ -1976,13 +2015,13 @@
           "shape":"NumberLengthBetween12And19",
           "documentation":"<p>The Primary Account Number (PAN), a unique identifier for a payment credit or debit card that associates the card with a specific account holder.</p>"
         },
-        "ValidationData":{
-          "shape":"NumberLengthBetween3And5",
-          "documentation":"<p>The CVV or CSC value for use for card data verification within Amazon Web Services Payment Cryptography.</p>"
-        },
         "VerificationAttributes":{
           "shape":"CardVerificationAttributes",
           "documentation":"<p>The algorithm to use for verification of card data within Amazon Web Services Payment Cryptography.</p>"
+        },
+        "ValidationData":{
+          "shape":"NumberLengthBetween3And5",
+          "documentation":"<p>The CVV or CSC value for use for card data verification within Amazon Web Services Payment Cryptography.</p>"
         }
       }
     },
@@ -2007,8 +2046,8 @@
       "type":"structure",
       "required":[
         "KeyIdentifier",
-        "Mac",
         "MessageData",
+        "Mac",
         "VerificationAttributes"
       ],
       "members":{
@@ -2016,21 +2055,21 @@
           "shape":"KeyArnOrKeyAliasType",
           "documentation":"<p>The <code>keyARN</code> of the encryption key that Amazon Web Services Payment Cryptography uses to verify MAC data.</p>"
         },
-        "Mac":{
-          "shape":"HexEvenLengthBetween4And128",
-          "documentation":"<p>The MAC being verified.</p>"
-        },
-        "MacLength":{
-          "shape":"IntegerRangeBetween4And16",
-          "documentation":"<p>The length of the MAC.</p>"
-        },
         "MessageData":{
           "shape":"HexEvenLengthBetween2And4096",
           "documentation":"<p>The data on for which MAC is under verification. This value must be hexBinary.</p>"
         },
+        "Mac":{
+          "shape":"HexEvenLengthBetween4And128",
+          "documentation":"<p>The MAC being verified.</p>"
+        },
         "VerificationAttributes":{
           "shape":"MacAttributes",
           "documentation":"<p>The attributes and data values to use for MAC verification within Amazon Web Services Payment Cryptography.</p>"
+        },
+        "MacLength":{
+          "shape":"IntegerRangeBetween4And16",
+          "documentation":"<p>The length of the MAC.</p>"
         }
       }
     },
@@ -2054,25 +2093,33 @@
     "VerifyPinDataInput":{
       "type":"structure",
       "required":[
-        "EncryptedPinBlock",
+        "VerificationKeyIdentifier",
         "EncryptionKeyIdentifier",
-        "PinBlockFormat",
-        "PrimaryAccountNumber",
         "VerificationAttributes",
-        "VerificationKeyIdentifier"
+        "EncryptedPinBlock",
+        "PrimaryAccountNumber",
+        "PinBlockFormat"
       ],
       "members":{
-        "DukptAttributes":{
-          "shape":"DukptAttributes",
-          "documentation":"<p>The attributes and values for the DUKPT encrypted PIN block data.</p>"
+        "VerificationKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the PIN verification key.</p>"
+        },
+        "EncryptionKeyIdentifier":{
+          "shape":"KeyArnOrKeyAliasType",
+          "documentation":"<p>The <code>keyARN</code> of the encryption key under which the PIN block data is encrypted. This key type can be PEK or BDK.</p>"
+        },
+        "VerificationAttributes":{
+          "shape":"PinVerificationAttributes",
+          "documentation":"<p>The attributes and values for PIN data verification.</p>"
         },
         "EncryptedPinBlock":{
           "shape":"HexLengthBetween16And32",
           "documentation":"<p>The encrypted PIN block data that Amazon Web Services Payment Cryptography verifies.</p>"
         },
-        "EncryptionKeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the encryption key under which the PIN block data is encrypted. This key type can be PEK or BDK.</p>"
+        "PrimaryAccountNumber":{
+          "shape":"NumberLengthBetween12And19",
+          "documentation":"<p>The Primary Account Number (PAN), a unique identifier for a payment credit or debit card that associates the card with a specific account holder.</p>"
         },
         "PinBlockFormat":{
           "shape":"PinBlockFormatForPinData",
@@ -2082,42 +2129,34 @@
           "shape":"IntegerRangeBetween4And12",
           "documentation":"<p>The length of PIN being verified.</p>"
         },
-        "PrimaryAccountNumber":{
-          "shape":"NumberLengthBetween12And19",
-          "documentation":"<p>The Primary Account Number (PAN), a unique identifier for a payment credit or debit card that associates the card with a specific account holder.</p>"
-        },
-        "VerificationAttributes":{
-          "shape":"PinVerificationAttributes",
-          "documentation":"<p>The attributes and values for PIN data verification.</p>"
-        },
-        "VerificationKeyIdentifier":{
-          "shape":"KeyArnOrKeyAliasType",
-          "documentation":"<p>The <code>keyARN</code> of the PIN verification key.</p>"
+        "DukptAttributes":{
+          "shape":"DukptAttributes",
+          "documentation":"<p>The attributes and values for the DUKPT encrypted PIN block data.</p>"
         }
       }
     },
     "VerifyPinDataOutput":{
       "type":"structure",
       "required":[
-        "EncryptionKeyArn",
-        "EncryptionKeyCheckValue",
         "VerificationKeyArn",
-        "VerificationKeyCheckValue"
+        "VerificationKeyCheckValue",
+        "EncryptionKeyArn",
+        "EncryptionKeyCheckValue"
       ],
       "members":{
-        "EncryptionKeyArn":{
+        "VerificationKeyArn":{
           "shape":"KeyArn",
-          "documentation":"<p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment Cryptography uses for encrypted pin block generation.</p>"
+          "documentation":"<p>The <code>keyARN</code> of the PIN encryption key that Amazon Web Services Payment Cryptography uses for PIN or PIN Offset verification.</p>"
         },
-        "EncryptionKeyCheckValue":{
+        "VerificationKeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
         },
-        "VerificationKeyArn":{
+        "EncryptionKeyArn":{
           "shape":"KeyArn",
-          "documentation":"<p>The <code>keyARN</code> of the PIN encryption key that Amazon Web Services Payment Cryptography uses for PIN or PIN Offset verification.</p>"
+          "documentation":"<p>The <code>keyARN</code> of the PEK that Amazon Web Services Payment Cryptography uses for encrypted pin block generation.</p>"
         },
-        "VerificationKeyCheckValue":{
+        "EncryptionKeyCheckValue":{
           "shape":"KeyCheckValue",
           "documentation":"<p>The key check value (KCV) of the encryption key. The KCV is used to check if all parties holding a given key have the same key or to detect that a key has changed.</p> <p>Amazon Web Services Payment Cryptography computes the KCV according to the CMAC specification.</p>"
         }
@@ -2128,7 +2167,7 @@
       "required":["PinVerificationKeyIndex"],
       "members":{
         "PinVerificationKeyIndex":{
-          "shape":"IntegerRangeBetween0And9",
+          "shape":"IntegerRangeBetween0And6",
           "documentation":"<p>The value for PIN verification index. It is used in the Visa PIN algorithm to calculate the PVV (PIN Verification Value).</p>"
         }
       },
@@ -2142,7 +2181,7 @@
       ],
       "members":{
         "PinVerificationKeyIndex":{
-          "shape":"IntegerRangeBetween0And9",
+          "shape":"IntegerRangeBetween0And6",
           "documentation":"<p>The value for PIN verification index. It is used in the Visa PIN algorithm to calculate the PVV (PIN Verification Value).</p>"
         },
         "VerificationValue":{
@@ -2164,11 +2203,37 @@
           "documentation":"<p>The encrypted PIN block data to verify.</p>"
         },
         "PinVerificationKeyIndex":{
-          "shape":"IntegerRangeBetween0And9",
+          "shape":"IntegerRangeBetween0And6",
           "documentation":"<p>The value for PIN verification index. It is used in the Visa PIN algorithm to calculate the PVV (PIN Verification Value).</p>"
         }
       },
       "documentation":"<p>Parameters that are required to generate or verify Visa PVV (PIN Verification Value).</p>"
+    },
+    "WrappedKey":{
+      "type":"structure",
+      "required":["WrappedKeyMaterial"],
+      "members":{
+        "WrappedKeyMaterial":{
+          "shape":"WrappedKeyMaterial",
+          "documentation":"<p>Parameter information of a WrappedKeyBlock for encryption key exchange.</p>"
+        },
+        "KeyCheckValueAlgorithm":{
+          "shape":"KeyCheckValueAlgorithm",
+          "documentation":"<p>The algorithm that Amazon Web Services Payment Cryptography uses to calculate the key check value (KCV). It is used to validate the key integrity.</p> <p>For TDES keys, the KCV is computed by encrypting 8 bytes, each with value of zero, with the key to be checked and retaining the 3 highest order bytes of the encrypted result. For AES keys, the KCV is computed using a CMAC algorithm where the input data is 16 bytes of zero and retaining the 3 highest order bytes of the encrypted result.</p>"
+        }
+      },
+      "documentation":"<p>Parameter information of a WrappedKeyBlock for encryption key exchange.</p>"
+    },
+    "WrappedKeyMaterial":{
+      "type":"structure",
+      "members":{
+        "Tr31KeyBlock":{
+          "shape":"Tr31WrappedKeyBlock",
+          "documentation":"<p>The TR-31 wrapped key block.</p>"
+        }
+      },
+      "documentation":"<p>Parameter information of a WrappedKeyBlock for encryption key exchange.</p>",
+      "union":true
     }
   },
   "documentation":"<p>You use the Amazon Web Services Payment Cryptography Data Plane to manage how encryption keys are used for payment-related transaction processing and associated cryptographic operations. You can encrypt, decrypt, generate, verify, and translate payment-related cryptographic operations in Amazon Web Services Payment Cryptography. For more information, see <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/userguide/data-operations.html\">Data operations</a> in the <i>Amazon Web Services Payment Cryptography User Guide</i>.</p> <p>To manage your encryption keys, you use the <a href=\"https://docs.aws.amazon.com/payment-cryptography/latest/APIReference/Welcome.html\">Amazon Web Services Payment Cryptography Control Plane</a>. You can create, import, export, share, manage, and delete keys. You can also manage Identity and Access Management (IAM) policies for keys. </p>"
diff --git a/tools/code-generation/api-descriptions/states-2016-11-23.normal.json b/tools/code-generation/api-descriptions/states-2016-11-23.normal.json
index cf26dad0308..4d4f708c5c8 100644
--- a/tools/code-generation/api-descriptions/states-2016-11-23.normal.json
+++ b/tools/code-generation/api-descriptions/states-2016-11-23.normal.json
@@ -11,7 +11,8 @@
     "serviceId":"SFN",
     "signatureVersion":"v4",
     "targetPrefix":"AWSStepFunctions",
-    "uid":"states-2016-11-23"
+    "uid":"states-2016-11-23",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CreateActivity":{
diff --git a/tools/code-generation/api-descriptions/swf-2012-01-25.normal.json b/tools/code-generation/api-descriptions/swf-2012-01-25.normal.json
index e73400a9c32..e72971db71f 100644
--- a/tools/code-generation/api-descriptions/swf-2012-01-25.normal.json
+++ b/tools/code-generation/api-descriptions/swf-2012-01-25.normal.json
@@ -11,7 +11,8 @@
     "serviceId":"SWF",
     "signatureVersion":"v4",
     "targetPrefix":"SimpleWorkflowService",
-    "uid":"swf-2012-01-25"
+    "uid":"swf-2012-01-25",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CountClosedWorkflowExecutions":{
diff --git a/tools/code-generation/api-descriptions/wafv2-2019-07-29.normal.json b/tools/code-generation/api-descriptions/wafv2-2019-07-29.normal.json
index 933dd528df9..ffe0d4ef941 100644
--- a/tools/code-generation/api-descriptions/wafv2-2019-07-29.normal.json
+++ b/tools/code-generation/api-descriptions/wafv2-2019-07-29.normal.json
@@ -11,7 +11,8 @@
     "serviceId":"WAFV2",
     "signatureVersion":"v4",
     "targetPrefix":"AWSWAF_20190729",
-    "uid":"wafv2-2019-07-29"
+    "uid":"wafv2-2019-07-29",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "AssociateWebACL":{
@@ -3343,14 +3344,14 @@
         },
         "InvalidFallbackBehavior":{
           "shape":"BodyParsingFallbackBehavior",
-          "documentation":"<p>What WAF should do if it fails to completely parse the JSON body. The options are the following:</p> <ul> <li> <p> <code>EVALUATE_AS_STRING</code> - Inspect the body as plain text. WAF applies the text transformations and inspection criteria that you defined for the JSON inspection to the body text string.</p> </li> <li> <p> <code>MATCH</code> - Treat the web request as matching the rule statement. WAF applies the rule action to the request.</p> </li> <li> <p> <code>NO_MATCH</code> - Treat the web request as not matching the rule statement.</p> </li> </ul> <p>If you don't provide this setting, WAF parses and evaluates the content only up to the first parsing failure that it encounters. </p> <p>WAF does its best to parse the entire JSON body, but might be forced to stop for reasons such as invalid characters, duplicate keys, truncation, and any content whose root node isn't an object or an array. </p> <p>WAF parses the JSON in the following examples as two valid key, value pairs: </p> <ul> <li> <p>Missing comma: <code>{\"key1\":\"value1\"\"key2\":\"value2\"}</code> </p> </li> <li> <p>Missing colon: <code>{\"key1\":\"value1\",\"key2\"\"value2\"}</code> </p> </li> <li> <p>Extra colons: <code>{\"key1\"::\"value1\",\"key2\"\"value2\"}</code> </p> </li> </ul>"
+          "documentation":"<p>What WAF should do if it fails to completely parse the JSON body. The options are the following:</p> <ul> <li> <p> <code>EVALUATE_AS_STRING</code> - Inspect the body as plain text. WAF applies the text transformations and inspection criteria that you defined for the JSON inspection to the body text string.</p> </li> <li> <p> <code>MATCH</code> - Treat the web request as matching the rule statement. WAF applies the rule action to the request.</p> </li> <li> <p> <code>NO_MATCH</code> - Treat the web request as not matching the rule statement.</p> </li> </ul> <p>If you don't provide this setting, WAF parses and evaluates the content only up to the first parsing failure that it encounters. </p> <note> <p>WAF parsing doesn't fully validate the input JSON string, so parsing can succeed even for invalid JSON. When parsing succeeds, WAF doesn't apply the fallback behavior. For more information, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-rule-statement-fields-list.html#waf-rule-statement-request-component-json-body\">JSON body</a> in the <i>WAF Developer Guide</i>.</p> </note>"
         },
         "OversizeHandling":{
           "shape":"OversizeHandling",
           "documentation":"<p>What WAF should do if the body is larger than WAF can inspect. </p> <p>WAF does not support inspecting the entire contents of the web request body if the body exceeds the limit for the resource type. When a web request body is larger than the limit, the underlying host service only forwards the contents that are within the limit to WAF for inspection. </p> <ul> <li> <p>For Application Load Balancer and AppSync, the limit is fixed at 8 KB (8,192 bytes).</p> </li> <li> <p>For CloudFront, API Gateway, Amazon Cognito, App Runner, and Verified Access, the default limit is 16 KB (16,384 bytes), and you can increase the limit for each resource type in the web ACL <code>AssociationConfig</code>, for additional processing fees. </p> </li> </ul> <p>The options for oversize handling are the following:</p> <ul> <li> <p> <code>CONTINUE</code> - Inspect the available body contents normally, according to the rule inspection criteria. </p> </li> <li> <p> <code>MATCH</code> - Treat the web request as matching the rule statement. WAF applies the rule action to the request.</p> </li> <li> <p> <code>NO_MATCH</code> - Treat the web request as not matching the rule statement.</p> </li> </ul> <p>You can combine the <code>MATCH</code> or <code>NO_MATCH</code> settings for oversize handling with your rule and web ACL action settings, so that you block any request whose body is over the limit. </p> <p>Default: <code>CONTINUE</code> </p>"
         }
       },
-      "documentation":"<p>Inspect the body of the web request as JSON. The body immediately follows the request headers. </p> <p>This is used to indicate the web request component to inspect, in the <a>FieldToMatch</a> specification. </p> <p>Use the specifications in this object to indicate which parts of the JSON body to inspect using the rule's inspection criteria. WAF inspects only the parts of the JSON that result from the matches that you indicate. </p> <p>Example JSON: <code>\"JsonBody\": { \"MatchPattern\": { \"All\": {} }, \"MatchScope\": \"ALL\" }</code> </p>"
+      "documentation":"<p>Inspect the body of the web request as JSON. The body immediately follows the request headers. </p> <p>This is used to indicate the web request component to inspect, in the <a>FieldToMatch</a> specification. </p> <p>Use the specifications in this object to indicate which parts of the JSON body to inspect using the rule's inspection criteria. WAF inspects only the parts of the JSON that result from the matches that you indicate. </p> <p>Example JSON: <code>\"JsonBody\": { \"MatchPattern\": { \"All\": {} }, \"MatchScope\": \"ALL\" }</code> </p> <p>For additional information about this request component option, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-rule-statement-fields-list.html#waf-rule-statement-request-component-json-body\">JSON body</a> in the <i>WAF Developer Guide</i>.</p>"
     },
     "JsonMatchPattern":{
       "type":"structure",
diff --git a/tools/code-generation/endpoints/cognito-identity-2014-06-30.endpoint-rule-set.json b/tools/code-generation/endpoints/cognito-identity-2014-06-30.endpoint-rule-set.json
index fccd2912a8e..348fc5c4bb0 100644
--- a/tools/code-generation/endpoints/cognito-identity-2014-06-30.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/cognito-identity-2014-06-30.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],