@itentialopensource/adapter-amazon_route53 0.2.2 → 0.3.0

package/adapter.js

@@ -2,17 +2,23 @@
 
 /* eslint import/no-dynamic-require: warn */
 /* eslint object-curly-newline: warn */
+/* eslint default-param-last: warn */
 
 // Set globals
 /* global log */
 
 /* Required libraries.  */
 const path = require('path');
-const aws4 = require('aws4');
-const AWS = require('aws-sdk');
-const requestCall = require('request');
 const querystring = require('querystring');
 
+const callOptions = {
+  service: 'route53',
+  datatype: {
+    request: 'XML',
+    response: 'XML2JSON'
+  }
+};
+
 /* Fetch in the other needed components for the this Adaptor */
 const AdapterBaseCl = require(path.join(__dirname, 'adapterBase.js'));
 
@@ -90,9 +96,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     let myIgnore = [
       'healthCheck',
       'iapGetAdapterWorkflowFunctions',
-      'iapHasAdapterEntity',
-      'iapVerifyAdapterCapability',
-      'iapUpdateAdapterEntityCache',
       'hasEntities',
       'getAuthorization',
       'getAuthorizationAndIdentifyRequest'
@@ -121,29 +124,15 @@ class AmazonRoute53 extends AdapterBaseCl {
    * @param {string} entity - the entity to be changed, if an action, schema or mock data file (optional)
    * @param {string} type - the type of entity file to change, (action, schema, mock) (optional)
    * @param {string} action - the action to be changed, if an action, schema or mock data file (optional)
+   * @param {boolean} replace - true to replace entire mock data, false to merge/append
    * @param {Callback} callback - The results of the call
    */
-  iapUpdateAdapterConfiguration(configFile, changes, entity, type, action, callback) {
+  iapUpdateAdapterConfiguration(configFile, changes, entity, type, action, replace, callback) {
     const meth = 'adapter-iapUpdateAdapterConfiguration';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
-    super.iapUpdateAdapterConfiguration(configFile, changes, entity, type, action, callback);
-  }
-
-  /**
-   * See if the API path provided is found in this adapter
-   *
-   * @function iapFindAdapterPath
-   * @param {string} apiPath - the api path to check on
-   * @param {Callback} callback - The results of the call
-   */
-  iapFindAdapterPath(apiPath, callback) {
-    const meth = 'adapter-iapFindAdapterPath';
-    const origin = `${this.id}-${meth}`;
-    log.trace(origin);
-
-    super.iapFindAdapterPath(apiPath, callback);
+    super.iapUpdateAdapterConfiguration(configFile, changes, entity, type, action, replace, callback);
   }
 
   /**
@@ -185,7 +174,7 @@ class AmazonRoute53 extends AdapterBaseCl {
   }
 
   /**
-    * @summary Get the Adaoter Queue
+    * @summary Get the Adapter Queue
     *
     * @function iapGetAdapterQueue
     * @param {Callback} callback - callback function
@@ -198,6 +187,22 @@ class AmazonRoute53 extends AdapterBaseCl {
     return super.iapGetAdapterQueue(callback);
   }
 
+  /* SCRIPT CALLS */
+  /**
+   * See if the API path provided is found in this adapter
+   *
+   * @function iapFindAdapterPath
+   * @param {string} apiPath - the api path to check on
+   * @param {Callback} callback - The results of the call
+   */
+  iapFindAdapterPath(apiPath, callback) {
+    const meth = 'adapter-iapFindAdapterPath';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
+
+    super.iapFindAdapterPath(apiPath, callback);
+  }
+
   /**
   * @summary Runs troubleshoot scripts for adapter
   *
@@ -298,176 +303,93 @@ class AmazonRoute53 extends AdapterBaseCl {
     }
   }
 
-  /* BROKER CALLS */
   /**
-   * @summary Determines if this adapter supports the specific entity
+   * @summary Deactivate adapter tasks
    *
-   * @function iapHasAdapterEntity
-   * @param {String} entityType - the entity type to check for
-   * @param {String/Array} entityId - the specific entity we are looking for
+   * @function iapDeactivateTasks
    *
-   * @param {Callback} callback - An array of whether the adapter can has the
-   *                              desired capability or an error
+   * @param {Array} tasks - List of tasks to deactivate
+   * @param {Callback} callback
    */
-  iapHasAdapterEntity(entityType, entityId, callback) {
-    const origin = `${this.id}-adapter-iapHasAdapterEntity`;
+  iapDeactivateTasks(tasks, callback) {
+    const meth = 'adapter-iapDeactivateTasks';
+    const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
-    // Make the call -
-    // iapVerifyAdapterCapability(entityType, actionType, entityId, callback)
-    return this.iapVerifyAdapterCapability(entityType, null, entityId, callback);
+    try {
+      return super.iapDeactivateTasks(tasks, callback);
+    } catch (err) {
+      log.error(`${origin}: ${err}`);
+      return callback(null, err);
+    }
   }
 
   /**
-   * @summary Provides a way for the adapter to tell north bound integrations
-   * whether the adapter supports type, action and specific entity
+   * @summary Activate adapter tasks that have previously been deactivated
    *
-   * @function iapVerifyAdapterCapability
-   * @param {String} entityType - the entity type to check for
-   * @param {String} actionType - the action type to check for
-   * @param {String/Array} entityId - the specific entity we are looking for
+   * @function iapActivateTasks
    *
-   * @param {Callback} callback - An array of whether the adapter can has the
-   *                              desired capability or an error
+   * @param {Array} tasks - List of tasks to activate
+   * @param {Callback} callback
    */
-  iapVerifyAdapterCapability(entityType, actionType, entityId, callback) {
-    const meth = 'adapterBase-iapVerifyAdapterCapability';
+  iapActivateTasks(tasks, callback) {
+    const meth = 'adapter-iapActivateTasks';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
-    // if caching
-    if (this.caching) {
-      // Make the call - iapVerifyAdapterCapability(entityType, actionType, entityId, callback)
-      return this.requestHandlerInst.iapVerifyAdapterCapability(entityType, actionType, entityId, (results, error) => {
-        if (error) {
-          return callback(null, error);
-        }
-
-        // if the cache needs to be updated, update and try again
-        if (results && results[0] === 'needupdate') {
-          switch (entityType) {
-            case 'template_entity': {
-              // if the cache is invalid, update the cache
-              return this.getEntities(null, null, null, null, (data, err) => {
-                if (err) {
-                  const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Could not update entity: $VARIABLE$, cache', [entityType], null, null, null);
-                  log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-                  return callback(null, errorObj);
-                }
-
-                // need to check the cache again since it has been updated
-                return this.requestHandlerInst.iapVerifyAdapterCapability(entityType, actionType, entityId, (vcapable, verror) => {
-                  if (verror) {
-                    return callback(null, verror);
-                  }
-
-                  return this.capabilityResults(vcapable, callback);
-                });
-              });
-            }
-            default: {
-              // unsupported entity type
-              const result = [false];
-
-              // put false in array for all entities
-              if (Array.isArray(entityId)) {
-                for (let e = 1; e < entityId.length; e += 1) {
-                  result.push(false);
-                }
-              }
-
-              return callback(result);
-            }
-          }
-        }
-
-        // return the results
-        return this.capabilityResults(results, callback);
-      });
-    }
-
-    // if no entity id
-    if (!entityId) {
-      // need to check the cache again since it has been updated
-      return this.requestHandlerInst.iapVerifyAdapterCapability(entityType, actionType, null, (vcapable, verror) => {
-        if (verror) {
-          return callback(null, verror);
-        }
-
-        return this.capabilityResults(vcapable, callback);
-      });
+    try {
+      return super.iapActivateTasks(tasks, callback);
+    } catch (err) {
+      log.error(`${origin}: ${err}`);
+      return callback(null, err);
     }
+  }
 
-    // if not caching
-    switch (entityType) {
-      case 'template_entity': {
-        // need to get the entities to check
-        return this.getEntities(null, null, null, null, (data, err) => {
-          if (err) {
-            const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Could not update entity: $VARIABLE$, cache', [entityType], null, null, null);
-            log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-            return callback(null, errorObj);
-          }
-
-          // need to check the cache again since it has been updated
-          return this.requestHandlerInst.iapVerifyAdapterCapability(entityType, actionType, null, (vcapable, verror) => {
-            if (verror) {
-              return callback(null, verror);
-            }
-
-            // is the entity in the list?
-            const isEntity = this.entityInList(entityId, data.response, callback);
-            const res = [];
-
-            // not found
-            for (let i = 0; i < isEntity.length; i += 1) {
-              if (vcapable) {
-                res.push(isEntity[i]);
-              } else {
-                res.push(false);
-              }
-            }
-
-            return callback(res);
-          });
-        });
-      }
-      default: {
-        // unsupported entity type
-        const result = [false];
-
-        // put false in array for all entities
-        if (Array.isArray(entityId)) {
-          for (let e = 1; e < entityId.length; e += 1) {
-            result.push(false);
-          }
-        }
+  /* CACHE CALLS */
+  /**
+   * @summary Populate the cache for the given entities
+   *
+   * @function iapPopulateEntityCache
+   * @param {String/Array of Strings} entityType - the entity type(s) to populate
+   * @param {Callback} callback - whether the cache was updated or not for each entity type
+   *
+   * @returns status of the populate
+   */
+  iapPopulateEntityCache(entityTypes, callback) {
+    const meth = 'adapter-iapPopulateEntityCache';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
 
-        return callback(result);
-      }
+    try {
+      return super.iapPopulateEntityCache(entityTypes, callback);
+    } catch (err) {
+      log.error(`${origin}: ${err}`);
+      return callback(null, err);
     }
   }
 
   /**
-   * @summary Updates the cache for all entities by call the get All entity method
-   *
-   * @function iapUpdateAdapterEntityCache
+   * @summary Retrieves data from cache for specified entity type
    *
+   * @function iapRetrieveEntitiesCache
+   * @param {String} entityType - entity of which to retrieve
+   * @param {Object} options - settings of which data to return and how to return it
+   * @param {Callback} callback - the data if it was retrieved
    */
-  iapUpdateAdapterEntityCache() {
-    const origin = `${this.id}-adapter-iapUpdateAdapterEntityCache`;
+  iapRetrieveEntitiesCache(entityType, options, callback) {
+    const meth = 'adapter-iapCheckEiapRetrieveEntitiesCachentityCached';
+    const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
-    if (this.caching) {
-      // if the cache is invalid, update the cache
-      this.getEntities(null, null, null, null, (data, err) => {
-        if (err) {
-          log.trace(`${origin}: Could not load template_entity into cache - ${err}`);
-        }
-      });
+    try {
+      return super.iapRetrieveEntitiesCache(entityType, options, callback);
+    } catch (err) {
+      log.error(`${origin}: ${err}`);
+      return callback(null, err);
     }
   }
 
+  /* BROKER CALLS */
   /**
    * @summary Determines if this adapter supports any in a list of entities
    *
@@ -484,7 +406,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.hasEntities(entityType, entityList, callback);
+      return super.hasEntitiesAuth(entityType, entityList, callOptions, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -506,7 +428,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.getDevice(deviceName, callback);
+      return super.getDeviceAuth(deviceName, callOptions, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -528,7 +450,29 @@ class AmazonRoute53 extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.getDevicesFiltered(options, callback);
+      // if no filtering
+      if (!options || !options.filter || !options.filter.name) {
+        return super.getDevicesFilteredAuth({}, callOptions, callback);
+      }
+
+      // Need to do filtering here because AWS does not support filtering with contains
+      return super.getDevicesFilteredAuth({}, callOptions, (devices, error) => {
+        if (error) {
+          return callback(null, error);
+        }
+
+        if (devices.list) {
+          const filterDevices = [];
+          for (let i = 0; i < devices.list.length; i += 1) {
+            if (devices.list[i].name.includes(options.filter.name)) {
+              filterDevices.push(devices.list[i]);
+            }
+          }
+          return callback({ total: filterDevices.length, list: filterDevices });
+        }
+
+        return devices;
+      });
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -550,7 +494,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.isAlive(deviceName, callback);
+      return super.isAliveAuth(deviceName, callOptions, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -573,7 +517,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.getConfig(deviceName, format, callback);
+      return super.getConfigAuth(deviceName, format, callOptions, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -594,7 +538,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.iapGetDeviceCount(callback);
+      return super.iapGetDeviceCountAuth(callOptions, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -602,6 +546,38 @@ class AmazonRoute53 extends AdapterBaseCl {
   }
 
   /* GENERIC ADAPTER REQUEST - allows extension of adapter without new calls being added */
+  /**
+   * Makes the requested generic call
+   *
+   * @function iapExpandedGenericAdapterRequest
+   * @param {Object} metadata - metadata for the call (optional).
+   *                 Can be a stringified Object.
+   * @param {String} uriPath - the path of the api call - do not include the host, port, base path or version (optional)
+   * @param {String} restMethod - the rest method (GET, POST, PUT, PATCH, DELETE) (optional)
+   * @param {Object} pathVars - the parameters to be put within the url path (optional).
+   *                 Can be a stringified Object.
+   * @param {Object} queryData - the parameters to be put on the url (optional).
+   *                 Can be a stringified Object.
+   * @param {Object} requestBody - the body to add to the request (optional).
+   *                 Can be a stringified Object.
+   * @param {Object} addlHeaders - additional headers to be put on the call (optional).
+   *                 Can be a stringified Object.
+   * @param {getCallback} callback - a callback function to return the result (Generics)
+   *                 or the error
+   */
+  iapExpandedGenericAdapterRequest(metadata, uriPath, restMethod, pathVars, queryData, requestBody, addlHeaders, callback) {
+    const meth = 'adapter-iapExpandedGenericAdapterRequest';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
+
+    try {
+      return super.iapExpandedGenericAdapterRequest(metadata, uriPath, restMethod, pathVars, queryData, requestBody, addlHeaders, callback);
+    } catch (err) {
+      log.error(`${origin}: ${err}`);
+      return callback(null, err);
+    }
+  }
+
   /**
    * Makes the requested generic call
    *
@@ -622,108 +598,11 @@ class AmazonRoute53 extends AdapterBaseCl {
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
-    if (this.suspended && this.suspendMode === 'error') {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
-    }
-
-    /* HERE IS WHERE YOU VALIDATE DATA */
-    if (uriPath === undefined || uriPath === null || uriPath === '') {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Data', ['uriPath'], null, null, null);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
-    }
-    if (restMethod === undefined || restMethod === null || restMethod === '') {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Data', ['restMethod'], null, null, null);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
-    }
-
-    /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
-    // remove any leading / and split the uripath into path variables
-    let myPath = uriPath;
-    while (myPath.indexOf('/') === 0) {
-      myPath = myPath.substring(1);
-    }
-    const pathVars = myPath.split('/');
-    const queryParamsAvailable = queryData;
-    const queryParams = {};
-    const bodyVars = requestBody;
-
-    // loop in template. long callback arg name to avoid identifier conflicts
-    Object.keys(queryParamsAvailable).forEach((thisKeyInQueryParamsAvailable) => {
-      if (queryParamsAvailable[thisKeyInQueryParamsAvailable] !== undefined && queryParamsAvailable[thisKeyInQueryParamsAvailable] !== null
-          && queryParamsAvailable[thisKeyInQueryParamsAvailable] !== '') {
-        queryParams[thisKeyInQueryParamsAvailable] = queryParamsAvailable[thisKeyInQueryParamsAvailable];
-      }
-    });
-
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-    // add headers if provided
-    if (addlHeaders) {
-      Object.assign(thisHeaderData, addlHeaders);
-    }
-
-    const reqObj = {
-      payload: bodyVars,
-      uriPathVars: pathVars,
-      uriQuery: queryParams,
-      addlHeaders: thisHeaderData
-    };
-
-    // determine the call and return flag
-    let action = 'getGenerics';
-    let returnF = true;
-    if (restMethod.toUpperCase() === 'POST') {
-      action = 'createGeneric';
-    } else if (restMethod.toUpperCase() === 'PUT') {
-      action = 'updateGeneric';
-    } else if (restMethod.toUpperCase() === 'PATCH') {
-      action = 'patchGeneric';
-    } else if (restMethod.toUpperCase() === 'DELETE') {
-      action = 'deleteGeneric';
-      returnF = false;
-    }
-
     try {
-      // Make the call -
-      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('.generic', action, reqObj, returnF, `${this.allProps.base_path}/${this.allProps.version}/${uriPath}/?${querystring.stringify(queryParams)}`, null, null, (irReturnData, irReturnError) => {
-        // if we received an error or their is no response on the results
-        // return an error
-        if (irReturnError) {
-          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-          return callback(null, irReturnError);
-        }
-        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['genericAdapterRequest'], null, null, null);
-          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-          return callback(null, errorObj);
-        }
-
-        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-        // return the response
-        return callback(irReturnData, null);
-      });
-    } catch (ex) {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
+      return super.genericAdapterRequest(uriPath, restMethod, queryData, requestBody, addlHeaders, callback);
+    } catch (err) {
+      log.error(`${origin}: ${err}`);
+      return callback(null, err);
     }
   }
 
@@ -747,109 +626,56 @@ class AmazonRoute53 extends AdapterBaseCl {
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
-    if (this.suspended && this.suspendMode === 'error') {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
-    }
-
-    /* HERE IS WHERE YOU VALIDATE DATA */
-    if (uriPath === undefined || uriPath === null || uriPath === '') {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Data', ['uriPath'], null, null, null);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
-    }
-    if (restMethod === undefined || restMethod === null || restMethod === '') {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Missing Data', ['restMethod'], null, null, null);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
-    }
-
-    /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
-    // remove any leading / and split the uripath into path variables
-    let myPath = uriPath;
-    while (myPath.indexOf('/') === 0) {
-      myPath = myPath.substring(1);
+    try {
+      return super.genericAdapterRequestNoBasePath(uriPath, restMethod, queryData, requestBody, addlHeaders, callback);
+    } catch (err) {
+      log.error(`${origin}: ${err}`);
+      return callback(null, err);
     }
-    const pathVars = myPath.split('/');
-    const queryParamsAvailable = queryData;
-    const queryParams = {};
-    const bodyVars = requestBody;
+  }
 
-    // loop in template. long callback arg name to avoid identifier conflicts
-    Object.keys(queryParamsAvailable).forEach((thisKeyInQueryParamsAvailable) => {
-      if (queryParamsAvailable[thisKeyInQueryParamsAvailable] !== undefined && queryParamsAvailable[thisKeyInQueryParamsAvailable] !== null
-          && queryParamsAvailable[thisKeyInQueryParamsAvailable] !== '') {
-        queryParams[thisKeyInQueryParamsAvailable] = queryParamsAvailable[thisKeyInQueryParamsAvailable];
-      }
-    });
+  /* INVENTORY CALLS */
+  /**
+   * @summary run the adapter lint script to return the results.
+   *
+   * @function iapRunAdapterLint
+   * @param {Callback} callback - callback function
+   */
+  iapRunAdapterLint(callback) {
+    const meth = 'adapter-iapRunAdapterLint';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-    // add headers if provided
-    if (addlHeaders) {
-      Object.assign(thisHeaderData, addlHeaders);
-    }
+    return super.iapRunAdapterLint(callback);
+  }
 
-    const reqObj = {
-      payload: bodyVars,
-      uriPathVars: pathVars,
-      uriQuery: queryParams,
-      addlHeaders: thisHeaderData
-    };
+  /**
+   * @summary run the adapter test scripts (baseunit and unit) to return the results.
+   *    can not run integration as there can be implications with that.
+   *
+   * @function iapRunAdapterTests
+   * @param {Callback} callback - callback function
+   */
+  iapRunAdapterTests(callback) {
+    const meth = 'adapter-iapRunAdapterTests';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
 
-    // determine the call and return flag
-    let action = 'getGenericsNoBase';
-    let returnF = true;
-    if (restMethod.toUpperCase() === 'POST') {
-      action = 'createGenericNoBase';
-    } else if (restMethod.toUpperCase() === 'PUT') {
-      action = 'updateGenericNoBase';
-    } else if (restMethod.toUpperCase() === 'PATCH') {
-      action = 'patchGenericNoBase';
-    } else if (restMethod.toUpperCase() === 'DELETE') {
-      action = 'deleteGenericNoBase';
-      returnF = false;
-    }
+    return super.iapRunAdapterTests(callback);
+  }
 
-    try {
-      // Make the call -
-      // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('.generic', action, reqObj, returnF, `${uriPath}/?${querystring.stringify(queryParams)}`, null, null, (irReturnData, irReturnError) => {
-        // if we received an error or their is no response on the results
-        // return an error
-        if (irReturnError) {
-          /* HERE IS WHERE YOU CAN ALTER THE ERROR MESSAGE */
-          return callback(null, irReturnError);
-        }
-        if (!Object.hasOwnProperty.call(irReturnData, 'response')) {
-          const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Invalid Response', ['genericAdapterRequestNoBasePath'], null, null, null);
-          log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-          return callback(null, errorObj);
-        }
+  /**
+   * @summary provide inventory information abbout the adapter
+   *
+   * @function iapGetAdapterInventory
+   * @param {Callback} callback - callback function
+   */
+  iapGetAdapterInventory(callback) {
+    const meth = 'adapter-iapGetAdapterInventory';
+    const origin = `${this.id}-${meth}`;
+    log.trace(origin);
 
-        /* HERE IS WHERE YOU CAN ALTER THE RETURN DATA */
-        // return the response
-        return callback(irReturnData, null);
-      });
-    } catch (ex) {
-      const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'Caught Exception', null, null, null, ex);
-      log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-      return callback(null, errorObj);
-    }
+    return super.iapGetAdapterInventory(callback);
   }
 
   /**
@@ -877,140 +703,6 @@ class AmazonRoute53 extends AdapterBaseCl {
    * @param {String} error - any error that occurred
    */
 
-  /**
-   * @summary Gets the hcma authorization for the call
-   *
-   * @function getAuthorization
-   * @param {string} method - the method for the action we are setting authorization for
-   * @param {string} pathBody - the path or body for the action we are setting authorization for
-   *
-   *  @return {Object} the headers to add to the request
-   */
-  getAuthorization(method, uripath, pathBody, requestHeaders, STSParams, roleName, callback) {
-    const origin = `${this.id}-adapter-getAuthorization`;
-    log.trace(origin);
-
-    // set up the options for the AWS header
-    const options = {
-      host: this.allProps.host,
-      path: uripath.replace(/\/\//g, '/'),
-      service: 'route53',
-      region: this.allProps.region
-    };
-    if (requestHeaders) {
-      options.headers = requestHeaders;
-    }
-
-    if (method !== 'GET' && method !== 'DELETE') {
-      options.body = JSON.stringify(pathBody);
-    }
-
-    // if we are using STS
-    if (STSParams) {
-      log.info('Using STS for AWS Authentication');
-
-      // set the original AWS access information (from properties)
-      AWS.config.update({
-        sessionToken: this.allProps.authentication.aws_session_token,
-        accessKeyId: this.allProps.authentication.aws_access_key,
-        secretAccessKey: this.allProps.authentication.aws_secret_key,
-        region: this.allProps.region
-      });
-
-      // use STS to get the AWS access information for the user defined in STWS Params
-      const sts = new AWS.STS();
-      const stsData = {
-        RoleArn: STSParams.RoleArn,
-        RoleSessionName: STSParams.RoleSessionName,
-        DurationSeconds: 3600
-      };
-      return sts.assumeRole(stsData, (err, data) => {
-        if (err) {
-          throw err;
-        }
-        // extract the user specific info from the response
-        const accessKeyId = data.Credentials.AccessKeyId;
-        const secretAccessKey = data.Credentials.SecretAccessKey;
-        const sessionToken = data.Credentials.SessionToken;
-
-        // call the signature with the user specific information
-        const authOpts = aws4.sign(options, { accessKeyId, secretAccessKey });
-        if (sessionToken) {
-          authOpts.headers['X-Amz-Security-Token'] = sessionToken;
-        }
-
-        // return the headers
-        return callback(authOpts.headers);
-      });
-    }
-
-    // if we are using adapter properties
-    if (!roleName) {
-      log.info('Using Adapter PROPERTIES for AWS Authentication');
-
-      // call the signature with the property information
-      const authOpts = aws4.sign(options, { accessKeyId: this.allProps.authentication.aws_access_key, secretAccessKey: this.allProps.authentication.aws_secret_key });
-      if (this.allProps.authentication.aws_session_token) {
-        authOpts.headers['X-Amz-Security-Token'] = this.allProps.authentication.aws_session_token;
-      }
-
-      // return the headers
-      return callback(authOpts.headers);
-    }
-
-    // if we are using a provided role name
-    log.info('Using roleName for AWS Authentication');
-
-    const getTokenOptions = {
-      method: 'PUT',
-      url: 'http://169.254.169.254/latest/api/token',
-      headers: {
-        'X-aws-ec2-metadata-token-ttl-seconds': 21600
-      }
-    };
-
-    return requestCall(getTokenOptions, (error1, response) => {
-      if (error1) {
-        return callback(null, error1);
-      }
-      if (!response || !response.body) {
-        return callback(null, 'No Authentication Token');
-      }
-      const tokenKey = response.body;
-      const toptions = {
-        method: 'GET',
-        url: `http://169.254.169.254/latest/meta-data/iam/security-credentials/${roleName}`,
-        headers: {
-          'X-aws-ec2-metadata-token': tokenKey
-        }
-      };
-      log.debug(`getting keys for user: ${roleName}`);
-      return requestCall(toptions, (error2, response2) => {
-        if (error2) {
-          return callback(null, error2);
-        }
-        if (!response2 || !response2.body) {
-          return callback(null, 'No Authentication Keys');
-        }
-        try {
-          const awsResponse = JSON.parse(response2.body);
-          const accessKeyId = awsResponse.AccessKeyId;
-          const secretAccessKey = awsResponse.SecretAccessKey;
-          const sessionToken = awsResponse.Token;
-          log.debug(`getting call signature with credntials for user: ${roleName}`);
-          const authOpts = aws4.sign(options, { accessKeyId, secretAccessKey });
-          if (sessionToken) {
-            authOpts.headers['X-Amz-Security-Token'] = sessionToken;
-          }
-          // return the headers
-          return callback(authOpts.headers);
-        } catch (e) {
-          return callback(null, e);
-        }
-      });
-    });
-  }
-
   /**
    * @summary wrapper for identifyRequest which sets up the necessary AWS authentication headers first
    *
@@ -1030,14 +722,35 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getAuthorizationAndIdentifyRequest';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
+    let querySchema = null;
 
     try {
+      // get entity schema for translating query vars
+      this.requestHandlerInst.propUtil.getEntitySchema(entity, action, null, null, async (schema, error) => {
+        if (error) {
+          console.log(error);
+        }
+        querySchema = schema;
+      });
+
+      // translate query vars
+      const thisQdata = this.requestHandlerInst.transUtil.formatInputData(requestObj.uriQuery);
+      thisQdata.ph_request_type = action;
+      const translatedQuery = this.requestHandlerInst.transUtil.mapToOutboundEntity(thisQdata, querySchema.requestSchema);
+
+      // remove the ph_request_type from the call
+      delete thisQdata.ph_request_type;
+
+      // replace queryvars with the translatedQuery
+      const regex = /(?<=\?)[^?]+/i;
+      const uriPathTranslated = uriPath.replace(regex, querystring.stringify(translatedQuery));
+
       // using this for method now - would like to use for path in the future
       const entitySchema = this.requestHandlerInst.propUtil.getEntitySchemaFromFS(entity, action);
       // thisPath = this.requestHandlerInst.restHandler.buildRequestPath(); - Needs to be exposed
 
       // Call to get the signature for the call
-      return this.getAuthorization(entitySchema.method, uriPath, requestObj.payload, requestObj.addlHeaders, stsParams, roleName, (signature, sigerr) => {
+      return this.requestHandlerInst.getAWSAuthorization(entitySchema.method, requestObj, uriPathTranslated, 'route53', stsParams, roleName, (signature, sigerr) => {
         if (sigerr) {
           const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, `Can not Authenticate ${sigerr}`, [], null, null, null);
           log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
@@ -1098,7 +811,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-activateKeySigningKeySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -1121,7 +833,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, hostedZoneId, name];
+    const pathVars = [hostedZoneId, name];
     const bodyVars = '';
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -1132,35 +844,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'activateKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey/${hostedZoneId}/${name}/activate?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'activateKeySigningKey', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -1226,7 +925,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-associateVPCWithHostedZoneSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -1249,7 +947,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -1260,35 +958,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'associateVPCWithHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/associatevpc?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'associateVPCWithHostedZone', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -1354,7 +1039,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-changeResourceRecordSetsSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -1377,7 +1061,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -1388,35 +1072,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'changeResourceRecordSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/rrset/?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'changeResourceRecordSets', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -1484,7 +1155,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-changeTagsForResourceSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -1512,7 +1182,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, resourceType, resourceId];
+    const pathVars = [resourceType, resourceId];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -1523,35 +1193,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'changeTagsForResource', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/tags/${resourceType}/${resourceId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'changeTagsForResource', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -1617,7 +1274,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listTagsForResourceSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -1640,7 +1296,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, resourceType, resourceId];
+    const pathVars = [resourceType, resourceId];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -1651,35 +1307,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTagsForResource', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/tags/${resourceType}/${resourceId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listTagsForResource', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -1743,7 +1386,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createHealthCheckSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -1761,7 +1403,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -1772,35 +1414,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createHealthCheck', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -1870,7 +1499,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listHealthChecksSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -1883,7 +1511,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { marker, maxitems, maxItems, markerQuery };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -1894,35 +1522,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHealthChecks', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listHealthChecks', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -1986,7 +1601,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createHostedZoneSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2004,7 +1618,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2015,35 +1629,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createHostedZone', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2115,7 +1716,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listHostedZonesSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2128,7 +1728,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { marker, maxitems, delegationsetid, maxItems, markerQuery };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2139,35 +1739,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHostedZones', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listHostedZones', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2231,7 +1818,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createKeySigningKeySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2249,7 +1835,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2260,35 +1846,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createKeySigningKey', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2352,7 +1925,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createQueryLoggingConfigSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2370,7 +1942,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2381,35 +1953,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createQueryLoggingConfig', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createQueryLoggingConfig', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2481,7 +2040,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listQueryLoggingConfigsSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2494,7 +2052,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { hostedzoneid, nexttoken, maxresults, maxResults, nextToken };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2505,35 +2063,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listQueryLoggingConfigs', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listQueryLoggingConfigs', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2597,7 +2142,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createReusableDelegationSetSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2615,7 +2159,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2626,35 +2170,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createReusableDelegationSet', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createReusableDelegationSet', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2720,7 +2251,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listReusableDelegationSetsSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2733,7 +2263,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { marker, maxitems };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2744,35 +2274,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listReusableDelegationSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listReusableDelegationSets', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2836,7 +2353,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createTrafficPolicySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2854,7 +2370,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2865,35 +2381,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createTrafficPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createTrafficPolicy', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -2957,7 +2460,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createTrafficPolicyInstanceSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -2975,7 +2477,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -2986,35 +2488,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createTrafficPolicyInstance', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3080,7 +2569,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createTrafficPolicyVersionSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3103,7 +2591,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3114,35 +2602,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createTrafficPolicyVersion', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createTrafficPolicyVersion', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3208,7 +2683,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-createVPCAssociationAuthorizationSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3231,7 +2705,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3242,35 +2716,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'createVPCAssociationAuthorization', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/authorizevpcassociation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'createVPCAssociationAuthorization', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3338,7 +2799,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listVPCAssociationAuthorizationsSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3356,7 +2816,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { nexttoken, maxresults };
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3367,35 +2827,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listVPCAssociationAuthorizations', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/authorizevpcassociation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listVPCAssociationAuthorizations', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3461,7 +2908,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deactivateKeySigningKeySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3484,7 +2930,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, hostedZoneId, name];
+    const pathVars = [hostedZoneId, name];
     const bodyVars = '';
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3495,35 +2941,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deactivateKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey/${hostedZoneId}/${name}/deactivate?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deactivateKeySigningKey', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3587,7 +3020,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteHealthCheckSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3605,7 +3037,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, healthCheckId];
+    const pathVars = [healthCheckId];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3616,35 +3048,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteHealthCheck', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3708,7 +3127,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getHealthCheckSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3726,7 +3144,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, healthCheckId];
+    const pathVars = [healthCheckId];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3737,35 +3155,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheck', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3831,7 +3236,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-updateHealthCheckSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3854,7 +3258,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, healthCheckId];
+    const pathVars = [healthCheckId];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3865,35 +3269,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateHealthCheck', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'updateHealthCheck', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -3957,7 +3348,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteHostedZoneSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -3975,7 +3365,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -3986,35 +3376,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteHostedZone', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4078,7 +3455,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getHostedZoneSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4096,7 +3472,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4107,35 +3483,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getHostedZone', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4201,7 +3564,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-updateHostedZoneCommentSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4224,7 +3586,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4235,35 +3597,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateHostedZoneComment', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'updateHostedZoneComment', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4329,7 +3678,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteKeySigningKeySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4352,7 +3700,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, hostedZoneId, name];
+    const pathVars = [hostedZoneId, name];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4363,35 +3711,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteKeySigningKey', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/keysigningkey/${hostedZoneId}/${name}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteKeySigningKey', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4455,7 +3790,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteQueryLoggingConfigSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4473,7 +3807,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4484,35 +3818,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteQueryLoggingConfig', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteQueryLoggingConfig', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4576,7 +3897,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getQueryLoggingConfigSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4594,7 +3914,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4605,35 +3925,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getQueryLoggingConfig', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/queryloggingconfig/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getQueryLoggingConfig', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4697,7 +4004,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteReusableDelegationSetSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4715,7 +4021,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4726,35 +4032,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteReusableDelegationSet', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteReusableDelegationSet', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4818,7 +4111,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getReusableDelegationSetSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4836,7 +4128,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4847,35 +4139,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getReusableDelegationSet', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/delegationset/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getReusableDelegationSet', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -4941,7 +4220,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteTrafficPolicySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -4964,7 +4242,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id, version];
+    const pathVars = [id, version];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -4975,35 +4253,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteTrafficPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}/${version}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteTrafficPolicy', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5069,7 +4334,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getTrafficPolicySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5092,7 +4356,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id, version];
+    const pathVars = [id, version];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5103,35 +4367,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getTrafficPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}/${version}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getTrafficPolicy', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5199,7 +4450,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-updateTrafficPolicyCommentSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5227,7 +4477,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id, version];
+    const pathVars = [id, version];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5238,35 +4488,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateTrafficPolicyComment', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicy/${id}/${version}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'updateTrafficPolicyComment', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5330,7 +4567,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteTrafficPolicyInstanceSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5348,7 +4584,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5359,35 +4595,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteTrafficPolicyInstance', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5451,7 +4674,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getTrafficPolicyInstanceSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5469,7 +4691,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5480,35 +4702,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getTrafficPolicyInstance', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5574,7 +4783,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-updateTrafficPolicyInstanceSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5597,7 +4805,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5608,35 +4816,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'updateTrafficPolicyInstance', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstance/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'updateTrafficPolicyInstance', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5702,7 +4897,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-deleteVPCAssociationAuthorizationSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5725,7 +4919,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5736,35 +4930,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'deleteVPCAssociationAuthorization', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/deauthorizevpcassociation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'deleteVPCAssociationAuthorization', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5828,7 +5009,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-disableHostedZoneDNSSECSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5846,7 +5026,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = '';
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5857,35 +5037,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'disableHostedZoneDNSSEC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/disable-dnssec?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'disableHostedZoneDNSSEC', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -5951,7 +5118,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-disassociateVPCFromHostedZoneSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -5974,7 +5140,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -5985,35 +5151,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'disassociateVPCFromHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/disassociatevpc?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'disassociateVPCFromHostedZone', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6077,7 +5230,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-enableHostedZoneDNSSECSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6095,7 +5247,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = '';
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6106,35 +5258,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'enableHostedZoneDNSSEC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/enable-dnssec?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'enableHostedZoneDNSSEC', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6198,7 +5337,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getAccountLimitSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6216,7 +5354,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, type];
+    const pathVars = [type];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6227,35 +5365,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'changeResourceRecordSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/accountlimit/${type}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'changeResourceRecordSets', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6319,7 +5444,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getChangeSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6337,7 +5461,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6348,35 +5472,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getChange', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/change/${id}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getChange', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6438,7 +5549,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getCheckerIpRangesSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6451,7 +5561,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6462,35 +5572,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getCheckerIpRanges', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/checkeripranges?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getCheckerIpRanges', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6554,7 +5651,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getDNSSECSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6572,7 +5668,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6583,35 +5679,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getDNSSEC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/dnssec?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getDNSSEC', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6679,7 +5762,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getGeoLocationSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6692,7 +5774,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { continentcode, countrycode, subdivisioncode };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6703,35 +5785,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getGeoLocation', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/geolocation?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getGeoLocation', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6793,7 +5862,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getHealthCheckCountSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6806,7 +5874,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6817,35 +5885,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheckCount', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheckcount?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheckCount', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -6909,7 +5964,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getHealthCheckLastFailureReasonSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -6927,7 +5981,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, healthCheckId];
+    const pathVars = [healthCheckId];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -6938,35 +5992,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheckLastFailureReason', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}/lastfailurereason?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheckLastFailureReason', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7030,7 +6071,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getHealthCheckStatusSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7048,7 +6088,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, healthCheckId];
+    const pathVars = [healthCheckId];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7059,35 +6099,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHealthCheckStatus', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/healthcheck/${healthCheckId}/status?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getHealthCheckStatus', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7149,7 +6176,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getHostedZoneCountSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7162,7 +6188,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7173,35 +6199,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHostedZoneCount', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonecount?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getHostedZoneCount', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7267,7 +6280,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getHostedZoneLimitSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7290,7 +6302,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id, type];
+    const pathVars = [id, type];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7301,35 +6313,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getHostedZoneLimit', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonelimit/${id}/${type}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getHostedZoneLimit', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7395,7 +6394,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getReusableDelegationSetLimitSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7418,7 +6416,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, id, type];
+    const pathVars = [id, type];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7429,35 +6427,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getReusableDelegationSetLimit', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/reusabledelegationsetlimit/${id}/${type}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getReusableDelegationSetLimit', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7519,7 +6504,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-getTrafficPolicyInstanceCountSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7532,7 +6516,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7543,35 +6527,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'getTrafficPolicyInstanceCount', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstancecount?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'getTrafficPolicyInstanceCount', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7641,7 +6612,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listGeoLocationsSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7654,7 +6624,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { startcontinentcode, startcountrycode, startsubdivisioncode, maxitems };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7665,35 +6635,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listGeoLocations', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/geolocations?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listGeoLocations', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7761,7 +6718,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listHostedZonesByNameSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7774,7 +6730,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { dnsname, hostedzoneid, maxitems };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7785,35 +6741,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHostedZonesByName', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonesbyname?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listHostedZonesByName', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -7883,7 +6826,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listHostedZonesByVPCSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -7906,7 +6848,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { vpcid, vpcregion, maxitems, nexttoken };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -7917,35 +6859,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listHostedZonesByVPC', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzonesbyvpc?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listHostedZonesByVPC', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8025,7 +6954,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listResourceRecordSetsSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8043,7 +6971,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { name, type, identifier, maxitems, maxItems, startRecordName, startRecordType, startRecordIdentifier };
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8054,35 +6982,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listResourceRecordSets', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/hostedzone/${id}/rrset?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listResourceRecordSets', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8148,7 +7063,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listTagsForResourcesSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8171,7 +7085,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = {};
     const queryParams = {};
-    const pathVars = [restVer, resourceType];
+    const pathVars = [resourceType];
     const bodyVars = body;
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8182,35 +7096,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '', contentType: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTagsForResources', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/tags/${resourceType}?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listTagsForResources', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8276,7 +7177,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listTrafficPoliciesSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8289,7 +7189,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { trafficpolicyid, maxitems };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8300,35 +7200,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicies', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicies?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicies', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8398,7 +7285,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listTrafficPolicyInstancesSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8411,7 +7297,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { hostedzoneid, trafficpolicyinstancename, trafficpolicyinstancetype, maxitems };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8422,35 +7308,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyInstances', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstances?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyInstances', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8520,7 +7393,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listTrafficPolicyInstancesByHostedZoneSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8538,7 +7410,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { id, trafficpolicyinstancename, trafficpolicyinstancetype, maxitems };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8549,35 +7421,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyInstancesByHostedZone', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstances/hostedzone?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyInstancesByHostedZone', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8651,7 +7510,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listTrafficPolicyInstancesByPolicySTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8674,7 +7532,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { id, version, hostedzoneid, trafficpolicyinstancename, trafficpolicyinstancetype, maxitems };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8685,35 +7543,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyInstancesByPolicy', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicyinstances/trafficpolicy?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyInstancesByPolicy', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8781,7 +7626,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-listTrafficPolicyVersionsSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8799,7 +7643,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { trafficpolicyversion, maxitems };
     const queryParams = {};
-    const pathVars = [restVer, id];
+    const pathVars = [id];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8810,35 +7654,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'listTrafficPolicyVersions', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/trafficpolicies/${id}/versions?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'listTrafficPolicyVersions', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {
@@ -8912,7 +7743,6 @@ class AmazonRoute53 extends AdapterBaseCl {
     const meth = 'adapter-testDNSAnswerSTSRole';
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
-    const restVer = this.allProps.aws_ver;
 
     if (this.suspended && this.suspendMode === 'error') {
       const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'AD.600', [], null, null, null);
@@ -8940,7 +7770,7 @@ class AmazonRoute53 extends AdapterBaseCl {
     /* HERE IS WHERE YOU SET THE DATA TO PASS INTO REQUEST */
     const queryParamsAvailable = { hostedzoneid, recordname, recordtype, resolverip, edns0clientsubnetip, edns0clientsubnetmask };
     const queryParams = {};
-    const pathVars = [restVer];
+    const pathVars = [];
     const bodyVars = {};
 
     // loop in template. long callback arg name to avoid identifier conflicts
@@ -8951,35 +7781,22 @@ class AmazonRoute53 extends AdapterBaseCl {
       }
     });
 
-    // if you want to expose addlHeaders to workflow, add it to the method signature here and in pronghorn.json
-    let thisHeaderData = null;
-    // if the additional headers was passed in as a string parse the json into an object
-    if (thisHeaderData !== null && thisHeaderData.constructor === String) {
-      try {
-        // parse the additional headers object that was passed in
-        thisHeaderData = JSON.parse(thisHeaderData);
-      } catch (err) {
-        const errorObj = this.requestHandlerInst.formatErrorObject(this.id, meth, 'addlHeaders string must be a stringified JSON', [], null, null, null);
-        log.error(`${origin}: ${errorObj.IAPerror.displayString}`);
-        return callback(null, errorObj);
-      }
-    } else if (thisHeaderData === null) {
-      thisHeaderData = { xAmzContentSha256: '', xAmzDate: '', xAmzAlgorithm: '', xAmzCredential: '', xAmzSecurityToken: '', xAmzSignature: '', xAmzSignedHeaders: '' };
-    }
-
     // set up the request object - payload, uriPathVars, uriQuery, uriOptions, addlHeaders, authData, callProperties, filter, priority, event
     // see adapter code documentation for more information on the request object's fields
     const reqObj = {
       payload: bodyVars,
       uriPathVars: pathVars,
       uriQuery: queryParams,
-      addlHeaders: thisHeaderData
+      authData: {
+        stsParams,
+        roleName
+      }
     };
 
     try {
       // Make the call -
       // identifyRequest(entity, action, requestObj, returnDataFlag, callback)
-      return this.getAuthorizationAndIdentifyRequest('Rest', 'testDNSAnswer', reqObj, true, `${this.allProps.base_path}/${this.allProps.version}/${restVer}/testdnsanswer?${querystring.stringify(queryParams)}`, stsParams, roleName, (irReturnData, irReturnError) => {
+      return this.requestHandlerInst.identifyRequest('Rest', 'testDNSAnswer', reqObj, true, (irReturnData, irReturnError) => {
         // if we received an error or their is no response on the results
         // return an error
         if (irReturnError) {