diff --git a/cognito-user-pool-client/index.js b/cognito-user-pool-client/index.js
index 097e505..6a51c90 100644
--- a/cognito-user-pool-client/index.js
+++ b/cognito-user-pool-client/index.js
@@ -9,6 +9,15 @@ let AWS = require('aws-sdk'),
         apiVersion: '2016-04-18'
     });
 
+function returnedData(data) {
+    return {
+        'ClientId': data.UserPoolClient.ClientId,
+        'CreationDate': data.UserPoolClient.CreationDate,
+        'LastModifiedDate': data.UserPoolClient.LastModifiedDate,
+        'ClientSecret': data.UserPoolClient.ClientSecret
+    }
+}
+
 let logic = {
     Create: CfnLambda.SDKAlias({
         api: CognitoApi,
@@ -33,24 +42,16 @@ let logic = {
             'SupportedIdentityProviders',
             'WriteAttributes'
         ],
-        returnAttrs: [
-            'UserPoolClient.ClientId',
-            'UserPoolClient.CreationDate',
-            'UserPoolClient.LastModifiedDate',
-            'UserPoolClient.ClientSecret'
-        ],
-        returnPhysicalId: 'UserPoolClient.ClientId'
+        returnAttrs: returnedData,
+        returnPhysicalId: function(data) {
+            return data.UserPoolClient.ClientId
+        }
     }),
 
     DoUpdate: CfnLambda.SDKAlias({
         api: CognitoApi,
         method: 'updateUserPoolClient',
-        returnAttrs: [
-            'UserPoolClient.ClientId',
-            'UserPoolClient.CreationDate',
-            'UserPoolClient.LastModifiedDate',
-            'UserPoolClient.ClientSecret'
-        ],
+        returnAttrs: returnedData,
         physicalIdAs: 'ClientId',
         keys: [
             'UserPoolId',
@@ -84,12 +85,7 @@ let logic = {
 logic.NoUpdate = CfnLambda.SDKAlias({
     api: CognitoApi,
     method: 'describeUserPoolClient',
-    returnAttrs: [
-        'UserPoolClient.ClientId',
-        'UserPoolClient.CreationDate',
-        'UserPoolClient.LastModifiedDate',
-        'UserPoolClient.ClientSecret'
-    ],
+    returnAttrs: returnedData,
     physicalIdAs: 'ClientId',
     keys: [
         'UserPoolId',