You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/11/06 21:04:32 UTC
[airavata-django-portal] branch master updated: AIRAVATA-2581 Airavata stubs package changed `apache.airavata` => `airavata`

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d4c6bc  AIRAVATA-2581 Airavata stubs package changed `apache.airavata` => `airavata`
2d4c6bc is described below

commit 2d4c6bc1c6a423106c475a1b10ce1a88bb1e2b03
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Nov 6 15:53:00 2017 -0500

    AIRAVATA-2581 Airavata stubs package changed `apache.airavata` => `airavata`
---
 .../model/messaging => airavata}/__init__.py       |    0
 {apache/airavata => airavata}/api/Airavata-remote  |   25 +-
 {apache/airavata => airavata}/api/Airavata.py      | 7859 +++++++++++---------
 {apache/airavata => airavata}/api/__init__.py      |    0
 {apache/airavata => airavata}/api/constants.py     |    0
 .../api/error}/__init__.py                         |    0
 .../workspace => airavata/api/error}/constants.py  |    0
 {apache/airavata => airavata}/api/error/ttypes.py  |    2 +-
 .../api/sharing/SharingRegistryService-remote      |    4 +-
 .../api/sharing/SharingRegistryService.py          |  438 +-
 .../airavata => airavata}/api/sharing/__init__.py  |    0
 .../workflow => airavata/api/sharing}/constants.py |    0
 .../airavata => airavata}/api/sharing/ttypes.py    |    2 +-
 airavata/api/ttypes.py                             |   35 +
 .../model/workspace => airavata/model}/__init__.py |    0
 .../data => airavata/model/appcatalog}/__init__.py |    0
 .../appcatalog/accountprovisioning}/__init__.py    |    0
 .../appcatalog/accountprovisioning}/constants.py   |    0
 .../model/appcatalog/accountprovisioning/ttypes.py |  243 +
 .../model/appcatalog/appdeployment}/__init__.py    |    0
 .../model/appcatalog/appdeployment}/constants.py   |    0
 .../model/appcatalog/appdeployment/ttypes.py       |    4 +-
 .../model/appcatalog/appinterface}/__init__.py     |    0
 .../model/appcatalog/appinterface}/constants.py    |    0
 .../model/appcatalog/appinterface/ttypes.py        |   12 +-
 .../model/appcatalog/computeresource}/__init__.py  |    0
 .../model/appcatalog/computeresource}/constants.py |    0
 .../model/appcatalog/computeresource/ttypes.py     |   10 +-
 .../model/appcatalog/gatewayprofile}/__init__.py   |    0
 .../model/appcatalog/gatewayprofile}/constants.py  |    0
 .../model/appcatalog/gatewayprofile/ttypes.py      |   81 +-
 .../model/appcatalog/parallelism}/__init__.py      |    0
 .../model/appcatalog/parallelism}/constants.py     |    0
 .../model/appcatalog/parallelism/ttypes.py         |    0
 .../model/appcatalog/storageresource}/__init__.py  |    0
 .../model/appcatalog/storageresource}/constants.py |    0
 .../model/appcatalog/storageresource/ttypes.py     |    8 +-
 .../appcatalog/userresourceprofile}/__init__.py    |    0
 .../appcatalog/userresourceprofile}/constants.py   |    0
 .../model/appcatalog/userresourceprofile/ttypes.py |   25 +-
 .../model/application/__init__.py                  |    0
 .../model/application/io}/__init__.py              |    0
 .../model/application/io}/constants.py             |    0
 .../model/application/io/ttypes.py                 |    2 +-
 .../event => airavata/model/commons}/__init__.py   |    0
 .../model/commons}/constants.py                    |    0
 .../airavata => airavata}/model/commons/ttypes.py  |    0
 .../experiment => airavata/model}/constants.py     |    0
 .../model/credential}/__init__.py                  |    0
 .../model/credential/store}/__init__.py            |    0
 .../model/credential/store}/constants.py           |    0
 .../model/credential/store}/ttypes.py              |    0
 .../airavata => airavata/model/data}/__init__.py   |    0
 .../model/data/movement}/__init__.py               |    0
 .../model/data/movement}/constants.py              |    0
 .../model/data/movement/ttypes.py                  |    2 +-
 .../model/data/replica}/__init__.py                |    0
 .../model/data/replica/constants.py                |    0
 .../model/data/replica/ttypes.py                   |    0
 .../model/dbevent/__init__.py                      |    0
 .../model/dbevent}/constants.py                    |    0
 .../airavata => airavata}/model/dbevent/ttypes.py  |    0
 .../model/experiment}/__init__.py                  |    0
 .../model/experiment}/constants.py                 |    0
 .../model/experiment/ttypes.py                     |   34 +-
 .../movement => airavata/model/group}/__init__.py  |    0
 .../io => airavata/model/group}/constants.py       |    0
 .../airavata => airavata}/model/group/ttypes.py    |    2 +-
 .../commons => airavata/model/job}/__init__.py     |    0
 .../model/job}/constants.py                        |    0
 {apache/airavata => airavata}/model/job/ttypes.py  |    6 +-
 {apache => airavata/model/messaging}/__init__.py   |    0
 .../model/messaging/event}/__init__.py             |    0
 .../model/messaging/event}/constants.py            |    0
 .../model/messaging/event/ttypes.py                |   10 +-
 .../model/process}/__init__.py                     |    0
 .../model/process}/constants.py                    |    0
 .../airavata => airavata}/model/process/ttypes.py  |   34 +-
 .../model/scheduling}/__init__.py                  |    0
 .../model/scheduling}/constants.py                 |    0
 .../model/scheduling/ttypes.py                     |    0
 .../model/security}/__init__.py                    |    0
 .../model/security}/constants.py                   |    0
 .../airavata => airavata}/model/security/ttypes.py |    0
 .../model/sharing}/__init__.py                     |    0
 .../model/sharing/constants.py                     |    0
 .../airavata => airavata}/model/sharing/ttypes.py  |    0
 .../model/status}/__init__.py                      |    0
 .../model/status}/constants.py                     |    0
 .../airavata => airavata}/model/status/ttypes.py   |    0
 .../model/task}/__init__.py                        |    0
 .../model/task}/constants.py                       |    0
 {apache/airavata => airavata}/model/task/ttypes.py |   32 +-
 .../model/tenant}/__init__.py                      |    0
 .../sharing => airavata/model/tenant}/constants.py |    0
 .../airavata => airavata}/model/tenant/ttypes.py   |    2 +-
 airavata/model/ttypes.py                           |   31 +
 .../model => airavata/model/user}/__init__.py      |    0
 .../airavata => airavata}/model/user/constants.py  |    0
 {apache/airavata => airavata}/model/user/ttypes.py |    2 +-
 .../error => airavata/model/workflow}/__init__.py  |    0
 .../error => airavata/model/workflow}/constants.py |    0
 .../airavata => airavata}/model/workflow/ttypes.py |   12 +-
 .../model/workspace}/__init__.py                   |    0
 .../model/workspace/constants.py                   |    0
 .../model/workspace/ttypes.py                      |    2 +-
 apache/airavata/api/ttypes.py                      |   34 -
 apache/airavata/model/ttypes.py                    |   31 -
 django_airavata/apps/api/serializers.py            |   16 +-
 django_airavata/apps/api/views.py                  |    4 +-
 django_airavata/apps/auth/utils.py                 |    2 +-
 django_airavata/apps/groups/views.py               |    4 +-
 django_airavata/middleware.py                      |    4 +-
 113 files changed, 5105 insertions(+), 3909 deletions(-)

diff --git a/apache/airavata/model/messaging/__init__.py b/airavata/__init__.py
similarity index 100%
rename from apache/airavata/model/messaging/__init__.py
rename to airavata/__init__.py
diff --git a/apache/airavata/api/Airavata-remote b/airavata/api/Airavata-remote
old mode 100644
new mode 100755
similarity index 98%
rename from apache/airavata/api/Airavata-remote
rename to airavata/api/Airavata-remote
index 72c6ce6..419bfb4
--- a/apache/airavata/api/Airavata-remote
+++ b/airavata/api/Airavata-remote
@@ -16,8 +16,8 @@ else:
 from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient
 from thrift.protocol.TBinaryProtocol import TBinaryProtocol
 
-from apache.airavata.api import Airavata
-from apache.airavata.api.ttypes import *
+from airavata.api import Airavata
+from airavata.api.ttypes import *
 
 if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('')
@@ -157,6 +157,9 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('  bool updateGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string storageId, StoragePreference storagePreference)')
     print('  bool deleteGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId)')
     print('  bool deleteGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string storageId)')
+    print('   getSSHAccountProvisioners(AuthzToken authzToken)')
+    print('  bool doesUserHaveSSHAccount(AuthzToken authzToken, string computeResourceId, string userId)')
+    print('  UserComputeResourcePreference setupUserComputeResourcePreferencesForSSH(AuthzToken authzToken, string computeResourceId, string userId, string airavataCredStoreToken)')
     print('  string registerUserResourceProfile(AuthzToken authzToken, UserResourceProfile userResourceProfile)')
     print('  UserResourceProfile getUserResourceProfile(AuthzToken authzToken, string userId, string gatewayID)')
     print('  bool updateUserResourceProfile(AuthzToken authzToken, string userId, string gatewayID, UserResourceProfile userResourceProfile)')
@@ -1070,6 +1073,24 @@ elif cmd == 'deleteGatewayStoragePreference':
         sys.exit(1)
     pp.pprint(client.deleteGatewayStoragePreference(eval(args[0]), args[1], args[2],))
 
+elif cmd == 'getSSHAccountProvisioners':
+    if len(args) != 1:
+        print('getSSHAccountProvisioners requires 1 args')
+        sys.exit(1)
+    pp.pprint(client.getSSHAccountProvisioners(eval(args[0]),))
+
+elif cmd == 'doesUserHaveSSHAccount':
+    if len(args) != 3:
+        print('doesUserHaveSSHAccount requires 3 args')
+        sys.exit(1)
+    pp.pprint(client.doesUserHaveSSHAccount(eval(args[0]), args[1], args[2],))
+
+elif cmd == 'setupUserComputeResourcePreferencesForSSH':
+    if len(args) != 4:
+        print('setupUserComputeResourcePreferencesForSSH requires 4 args')
+        sys.exit(1)
+    pp.pprint(client.setupUserComputeResourcePreferencesForSSH(eval(args[0]), args[1], args[2], args[3],))
+
 elif cmd == 'registerUserResourceProfile':
     if len(args) != 2:
         print('registerUserResourceProfile requires 2 args')
diff --git a/apache/airavata/api/Airavata.py b/airavata/api/Airavata.py
similarity index 84%
rename from apache/airavata/api/Airavata.py
rename to airavata/api/Airavata.py
index 8263292..cd8cae0 100644
--- a/apache/airavata/api/Airavata.py
+++ b/airavata/api/Airavata.py
@@ -2901,6 +2901,40 @@ class Iface(object):
         """
         pass
 
+    def getSSHAccountProvisioners(self, authzToken):
+        """
+        Parameters:
+         - authzToken
+        """
+        pass
+
+    def doesUserHaveSSHAccount(self, authzToken, computeResourceId, userId):
+        """
+        Check if user has an SSH account on the given compute resource. This
+        method will only work if the compute resource has an SSHAccountProvisioner configured for it.
+
+        Parameters:
+         - authzToken
+         - computeResourceId
+         - userId
+        """
+        pass
+
+    def setupUserComputeResourcePreferencesForSSH(self, authzToken, computeResourceId, userId, airavataCredStoreToken):
+        """
+        Setup and return a UserComputeResourcePreference object for this user to SSH into the given compute resource with
+        the given SSH credential. This method will only work if the compute resource has an SSHAccountProvisioner
+        configured for it. The returned UserComputeResourcePreference object is not saved; it is up to the client to
+        call addUserComputeResourcePreference to persist it.
+
+        Parameters:
+         - authzToken
+         - computeResourceId
+         - userId
+         - airavataCredStoreToken
+        """
+        pass
+
     def registerUserResourceProfile(self, authzToken, userResourceProfile):
         """
         Register User Resource Profile.
@@ -10836,6 +10870,141 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGatewayStoragePreference failed: unknown result")
 
+    def getSSHAccountProvisioners(self, authzToken):
+        """
+        Parameters:
+         - authzToken
+        """
+        self.send_getSSHAccountProvisioners(authzToken)
+        return self.recv_getSSHAccountProvisioners()
+
+    def send_getSSHAccountProvisioners(self, authzToken):
+        self._oprot.writeMessageBegin('getSSHAccountProvisioners', TMessageType.CALL, self._seqid)
+        args = getSSHAccountProvisioners_args()
+        args.authzToken = authzToken
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getSSHAccountProvisioners(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getSSHAccountProvisioners_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        if result.ire is not None:
+            raise result.ire
+        if result.ace is not None:
+            raise result.ace
+        if result.ase is not None:
+            raise result.ase
+        if result.ae is not None:
+            raise result.ae
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getSSHAccountProvisioners failed: unknown result")
+
+    def doesUserHaveSSHAccount(self, authzToken, computeResourceId, userId):
+        """
+        Check if user has an SSH account on the given compute resource. This
+        method will only work if the compute resource has an SSHAccountProvisioner configured for it.
+
+        Parameters:
+         - authzToken
+         - computeResourceId
+         - userId
+        """
+        self.send_doesUserHaveSSHAccount(authzToken, computeResourceId, userId)
+        return self.recv_doesUserHaveSSHAccount()
+
+    def send_doesUserHaveSSHAccount(self, authzToken, computeResourceId, userId):
+        self._oprot.writeMessageBegin('doesUserHaveSSHAccount', TMessageType.CALL, self._seqid)
+        args = doesUserHaveSSHAccount_args()
+        args.authzToken = authzToken
+        args.computeResourceId = computeResourceId
+        args.userId = userId
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_doesUserHaveSSHAccount(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = doesUserHaveSSHAccount_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        if result.ire is not None:
+            raise result.ire
+        if result.ace is not None:
+            raise result.ace
+        if result.ase is not None:
+            raise result.ase
+        if result.ae is not None:
+            raise result.ae
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "doesUserHaveSSHAccount failed: unknown result")
+
+    def setupUserComputeResourcePreferencesForSSH(self, authzToken, computeResourceId, userId, airavataCredStoreToken):
+        """
+        Setup and return a UserComputeResourcePreference object for this user to SSH into the given compute resource with
+        the given SSH credential. This method will only work if the compute resource has an SSHAccountProvisioner
+        configured for it. The returned UserComputeResourcePreference object is not saved; it is up to the client to
+        call addUserComputeResourcePreference to persist it.
+
+        Parameters:
+         - authzToken
+         - computeResourceId
+         - userId
+         - airavataCredStoreToken
+        """
+        self.send_setupUserComputeResourcePreferencesForSSH(authzToken, computeResourceId, userId, airavataCredStoreToken)
+        return self.recv_setupUserComputeResourcePreferencesForSSH()
+
+    def send_setupUserComputeResourcePreferencesForSSH(self, authzToken, computeResourceId, userId, airavataCredStoreToken):
+        self._oprot.writeMessageBegin('setupUserComputeResourcePreferencesForSSH', TMessageType.CALL, self._seqid)
+        args = setupUserComputeResourcePreferencesForSSH_args()
+        args.authzToken = authzToken
+        args.computeResourceId = computeResourceId
+        args.userId = userId
+        args.airavataCredStoreToken = airavataCredStoreToken
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_setupUserComputeResourcePreferencesForSSH(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = setupUserComputeResourcePreferencesForSSH_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        if result.ire is not None:
+            raise result.ire
+        if result.ace is not None:
+            raise result.ace
+        if result.ase is not None:
+            raise result.ase
+        if result.ae is not None:
+            raise result.ae
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "setupUserComputeResourcePreferencesForSSH failed: unknown result")
+
     def registerUserResourceProfile(self, authzToken, userResourceProfile):
         """
         Register User Resource Profile.
@@ -12741,6 +12910,9 @@ class Processor(Iface, TProcessor):
         self._processMap["updateGatewayStoragePreference"] = Processor.process_updateGatewayStoragePreference
         self._processMap["deleteGatewayComputeResourcePreference"] = Processor.process_deleteGatewayComputeResourcePreference
         self._processMap["deleteGatewayStoragePreference"] = Processor.process_deleteGatewayStoragePreference
+        self._processMap["getSSHAccountProvisioners"] = Processor.process_getSSHAccountProvisioners
+        self._processMap["doesUserHaveSSHAccount"] = Processor.process_doesUserHaveSSHAccount
+        self._processMap["setupUserComputeResourcePreferencesForSSH"] = Processor.process_setupUserComputeResourcePreferencesForSSH
         self._processMap["registerUserResourceProfile"] = Processor.process_registerUserResourceProfile
         self._processMap["getUserResourceProfile"] = Processor.process_getUserResourceProfile
         self._processMap["updateUserResourceProfile"] = Processor.process_updateUserResourceProfile
@@ -12803,16 +12975,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -12834,16 +13006,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -12865,16 +13037,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -12896,16 +13068,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -12927,16 +13099,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -12958,16 +13130,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -12989,16 +13161,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13020,16 +13192,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13051,16 +13223,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13082,16 +13254,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13113,16 +13285,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13144,16 +13316,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13175,16 +13347,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13206,16 +13378,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13237,13 +13409,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13265,13 +13437,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13293,13 +13465,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13321,13 +13493,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13349,13 +13521,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13377,13 +13549,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13405,13 +13577,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13433,13 +13605,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13461,13 +13633,13 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
         except Exception as ex:
@@ -13489,16 +13661,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13520,19 +13692,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
+        except airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
             msg_type = TMessageType.REPLY
             result.pnfe = pnfe
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13554,19 +13726,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
+        except airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
             msg_type = TMessageType.REPLY
             result.pnfe = pnfe
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13588,19 +13760,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
+        except airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
             msg_type = TMessageType.REPLY
             result.pnfe = pnfe
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13622,16 +13794,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13653,16 +13825,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13684,16 +13856,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13715,16 +13887,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13746,19 +13918,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
+        except airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
             msg_type = TMessageType.REPLY
             result.pnfe = pnfe
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13780,16 +13952,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13811,16 +13983,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13842,16 +14014,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13873,19 +14045,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13907,19 +14079,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13941,19 +14113,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -13975,19 +14147,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14009,7 +14181,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14031,7 +14203,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14053,19 +14225,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14087,19 +14259,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14121,19 +14293,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14155,19 +14327,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14189,19 +14361,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14223,19 +14395,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14257,19 +14429,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14291,22 +14463,22 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
-        except apache.airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
+        except airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
             msg_type = TMessageType.REPLY
             result.pnfe = pnfe
         except Exception as ex:
@@ -14328,22 +14500,22 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
-        except apache.airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
+        except airavata.api.error.ttypes.ProjectNotFoundException as pnfe:
             msg_type = TMessageType.REPLY
             result.pnfe = pnfe
         except Exception as ex:
@@ -14365,19 +14537,19 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.ExperimentNotFoundException as enf:
+        except airavata.api.error.ttypes.ExperimentNotFoundException as enf:
             msg_type = TMessageType.REPLY
             result.enf = enf
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14399,16 +14571,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14430,16 +14602,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14461,16 +14633,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14492,16 +14664,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14523,16 +14695,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14554,16 +14726,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14585,16 +14757,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14616,16 +14788,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14647,16 +14819,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14678,16 +14850,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14709,16 +14881,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14740,16 +14912,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14771,16 +14943,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14802,16 +14974,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14833,16 +15005,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14864,16 +15036,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14895,16 +15067,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14926,16 +15098,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14957,16 +15129,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -14988,16 +15160,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15019,16 +15191,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15050,16 +15222,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15081,16 +15253,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15112,16 +15284,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15143,16 +15315,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15174,16 +15346,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15205,16 +15377,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15236,16 +15408,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15267,16 +15439,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15298,16 +15470,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15329,16 +15501,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15360,16 +15532,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15391,16 +15563,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15422,16 +15594,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15453,16 +15625,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15484,16 +15656,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15515,16 +15687,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15546,16 +15718,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15577,16 +15749,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15608,16 +15780,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15639,16 +15811,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15670,16 +15842,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15701,16 +15873,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15732,16 +15904,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15763,16 +15935,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15794,16 +15966,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15825,16 +15997,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15856,16 +16028,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15887,16 +16059,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15918,16 +16090,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15949,16 +16121,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -15980,16 +16152,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16011,16 +16183,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16042,16 +16214,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16073,16 +16245,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16104,16 +16276,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16135,16 +16307,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16166,16 +16338,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16197,16 +16369,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16228,16 +16400,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16259,16 +16431,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16290,16 +16462,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16321,16 +16493,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16352,16 +16524,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16383,16 +16555,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16414,16 +16586,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16445,16 +16617,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16476,16 +16648,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16507,16 +16679,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16538,16 +16710,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16569,16 +16741,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16600,16 +16772,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16631,16 +16803,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16662,16 +16834,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16693,16 +16865,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16724,16 +16896,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16755,16 +16927,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16786,16 +16958,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16817,16 +16989,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16848,16 +17020,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16879,16 +17051,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16910,16 +17082,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16931,6 +17103,99 @@ class Processor(Iface, TProcessor):
         oprot.writeMessageEnd()
         oprot.trans.flush()
 
+    def process_getSSHAccountProvisioners(self, seqid, iprot, oprot):
+        args = getSSHAccountProvisioners_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getSSHAccountProvisioners_result()
+        try:
+            result.success = self._handler.getSSHAccountProvisioners(args.authzToken)
+            msg_type = TMessageType.REPLY
+        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+            raise
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
+            msg_type = TMessageType.REPLY
+            result.ire = ire
+        except airavata.api.error.ttypes.AiravataClientException as ace:
+            msg_type = TMessageType.REPLY
+            result.ace = ace
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
+            msg_type = TMessageType.REPLY
+            result.ase = ase
+        except airavata.api.error.ttypes.AuthorizationException as ae:
+            msg_type = TMessageType.REPLY
+            result.ae = ae
+        except Exception as ex:
+            msg_type = TMessageType.EXCEPTION
+            logging.exception(ex)
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getSSHAccountProvisioners", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_doesUserHaveSSHAccount(self, seqid, iprot, oprot):
+        args = doesUserHaveSSHAccount_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = doesUserHaveSSHAccount_result()
+        try:
+            result.success = self._handler.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, args.userId)
+            msg_type = TMessageType.REPLY
+        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+            raise
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
+            msg_type = TMessageType.REPLY
+            result.ire = ire
+        except airavata.api.error.ttypes.AiravataClientException as ace:
+            msg_type = TMessageType.REPLY
+            result.ace = ace
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
+            msg_type = TMessageType.REPLY
+            result.ase = ase
+        except airavata.api.error.ttypes.AuthorizationException as ae:
+            msg_type = TMessageType.REPLY
+            result.ae = ae
+        except Exception as ex:
+            msg_type = TMessageType.EXCEPTION
+            logging.exception(ex)
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("doesUserHaveSSHAccount", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_setupUserComputeResourcePreferencesForSSH(self, seqid, iprot, oprot):
+        args = setupUserComputeResourcePreferencesForSSH_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = setupUserComputeResourcePreferencesForSSH_result()
+        try:
+            result.success = self._handler.setupUserComputeResourcePreferencesForSSH(args.authzToken, args.computeResourceId, args.userId, args.airavataCredStoreToken)
+            msg_type = TMessageType.REPLY
+        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+            raise
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
+            msg_type = TMessageType.REPLY
+            result.ire = ire
+        except airavata.api.error.ttypes.AiravataClientException as ace:
+            msg_type = TMessageType.REPLY
+            result.ace = ace
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
+            msg_type = TMessageType.REPLY
+            result.ase = ase
+        except airavata.api.error.ttypes.AuthorizationException as ae:
+            msg_type = TMessageType.REPLY
+            result.ae = ae
+        except Exception as ex:
+            msg_type = TMessageType.EXCEPTION
+            logging.exception(ex)
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("setupUserComputeResourcePreferencesForSSH", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
     def process_registerUserResourceProfile(self, seqid, iprot, oprot):
         args = registerUserResourceProfile_args()
         args.read(iprot)
@@ -16941,16 +17206,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -16972,16 +17237,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17003,16 +17268,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17034,16 +17299,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17065,16 +17330,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17096,16 +17361,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17127,16 +17392,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17158,16 +17423,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17189,16 +17454,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17220,16 +17485,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17251,16 +17516,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17282,16 +17547,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17313,16 +17578,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17344,16 +17609,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17375,16 +17640,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17406,16 +17671,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17437,16 +17702,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17468,16 +17733,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17499,16 +17764,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17530,16 +17795,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17561,16 +17826,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17592,16 +17857,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17623,16 +17888,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17654,16 +17919,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17685,16 +17950,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17716,16 +17981,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17747,16 +18012,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17778,16 +18043,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17809,16 +18074,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17840,16 +18105,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17871,16 +18136,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17902,16 +18167,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17933,16 +18198,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17964,16 +18229,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -17995,16 +18260,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -18026,16 +18291,16 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.api.error.ttypes.InvalidRequestException as ire:
+        except airavata.api.error.ttypes.InvalidRequestException as ire:
             msg_type = TMessageType.REPLY
             result.ire = ire
-        except apache.airavata.api.error.ttypes.AiravataClientException as ace:
+        except airavata.api.error.ttypes.AiravataClientException as ace:
             msg_type = TMessageType.REPLY
             result.ace = ace
-        except apache.airavata.api.error.ttypes.AiravataSystemException as ase:
+        except airavata.api.error.ttypes.AiravataSystemException as ase:
             msg_type = TMessageType.REPLY
             result.ase = ase
-        except apache.airavata.api.error.ttypes.AuthorizationException as ae:
+        except airavata.api.error.ttypes.AuthorizationException as ae:
             msg_type = TMessageType.REPLY
             result.ae = ae
         except Exception as ex:
@@ -18058,7 +18323,7 @@ class getAPIVersion_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, authzToken=None,):
@@ -18075,7 +18340,7 @@ class getAPIVersion_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18125,10 +18390,10 @@ class getAPIVersion_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -18154,25 +18419,25 @@ class getAPIVersion_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18234,7 +18499,7 @@ class isUserExists_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'userName', 'UTF8', None, ),  # 3
     )
@@ -18255,7 +18520,7 @@ class isUserExists_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18327,10 +18592,10 @@ class isUserExists_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -18356,25 +18621,25 @@ class isUserExists_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18435,8 +18700,8 @@ class addGateway_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'gateway', (apache.airavata.model.workspace.ttypes.Gateway, apache.airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'gateway', (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, gateway=None,):
@@ -18454,13 +18719,13 @@ class addGateway_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.gateway = apache.airavata.model.workspace.ttypes.Gateway()
+                    self.gateway = airavata.model.workspace.ttypes.Gateway()
                     self.gateway.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18516,10 +18781,10 @@ class addGateway_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -18545,25 +18810,25 @@ class addGateway_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18624,7 +18889,7 @@ class getAllUsersInGateway_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -18643,7 +18908,7 @@ class getAllUsersInGateway_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18704,10 +18969,10 @@ class getAllUsersInGateway_result(object):
 
     thrift_spec = (
         (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -18738,25 +19003,25 @@ class getAllUsersInGateway_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18821,9 +19086,9 @@ class updateGateway_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'updatedGateway', (apache.airavata.model.workspace.ttypes.Gateway, apache.airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'updatedGateway', (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, gatewayId=None, updatedGateway=None,):
@@ -18842,7 +19107,7 @@ class updateGateway_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18853,7 +19118,7 @@ class updateGateway_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.updatedGateway = apache.airavata.model.workspace.ttypes.Gateway()
+                    self.updatedGateway = airavata.model.workspace.ttypes.Gateway()
                     self.updatedGateway.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -18915,10 +19180,10 @@ class updateGateway_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -18944,25 +19209,25 @@ class updateGateway_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19023,7 +19288,7 @@ class getGateway_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -19042,7 +19307,7 @@ class getGateway_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19102,11 +19367,11 @@ class getGateway_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.workspace.ttypes.Gateway, apache.airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -19127,31 +19392,31 @@ class getGateway_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.workspace.ttypes.Gateway()
+                    self.success = airavata.model.workspace.ttypes.Gateway()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19212,7 +19477,7 @@ class deleteGateway_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -19231,7 +19496,7 @@ class deleteGateway_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19292,10 +19557,10 @@ class deleteGateway_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -19321,25 +19586,25 @@ class deleteGateway_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19399,7 +19664,7 @@ class getAllGateways_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, authzToken=None,):
@@ -19416,7 +19681,7 @@ class getAllGateways_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19465,11 +19730,11 @@ class getAllGateways_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.workspace.ttypes.Gateway, apache.airavata.model.workspace.ttypes.Gateway.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Gateway, airavata.model.workspace.ttypes.Gateway.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -19493,7 +19758,7 @@ class getAllGateways_result(object):
                     self.success = []
                     (_etype10, _size7) = iprot.readListBegin()
                     for _i11 in range(_size7):
-                        _elem12 = apache.airavata.model.workspace.ttypes.Gateway()
+                        _elem12 = airavata.model.workspace.ttypes.Gateway()
                         _elem12.read(iprot)
                         self.success.append(_elem12)
                     iprot.readListEnd()
@@ -19501,25 +19766,25 @@ class getAllGateways_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19583,7 +19848,7 @@ class isGatewayExist_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -19602,7 +19867,7 @@ class isGatewayExist_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19663,10 +19928,10 @@ class isGatewayExist_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -19692,25 +19957,25 @@ class isGatewayExist_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19771,8 +20036,8 @@ class createNotification_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'notification', (apache.airavata.model.workspace.ttypes.Notification, apache.airavata.model.workspace.ttypes.Notification.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'notification', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, notification=None,):
@@ -19790,13 +20055,13 @@ class createNotification_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.notification = apache.airavata.model.workspace.ttypes.Notification()
+                    self.notification = airavata.model.workspace.ttypes.Notification()
                     self.notification.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19852,10 +20117,10 @@ class createNotification_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -19881,25 +20146,25 @@ class createNotification_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -19960,8 +20225,8 @@ class updateNotification_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'notification', (apache.airavata.model.workspace.ttypes.Notification, apache.airavata.model.workspace.ttypes.Notification.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'notification', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, notification=None,):
@@ -19979,13 +20244,13 @@ class updateNotification_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.notification = apache.airavata.model.workspace.ttypes.Notification()
+                    self.notification = airavata.model.workspace.ttypes.Notification()
                     self.notification.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20041,10 +20306,10 @@ class updateNotification_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -20070,25 +20335,25 @@ class updateNotification_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20150,7 +20415,7 @@ class deleteNotification_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'notificationId', 'UTF8', None, ),  # 3
     )
@@ -20171,7 +20436,7 @@ class deleteNotification_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20243,10 +20508,10 @@ class deleteNotification_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -20272,25 +20537,25 @@ class deleteNotification_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20352,7 +20617,7 @@ class getNotification_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'notificationId', 'UTF8', None, ),  # 3
     )
@@ -20373,7 +20638,7 @@ class getNotification_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20444,11 +20709,11 @@ class getNotification_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.workspace.ttypes.Notification, apache.airavata.model.workspace.ttypes.Notification.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -20469,31 +20734,31 @@ class getNotification_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.workspace.ttypes.Notification()
+                    self.success = airavata.model.workspace.ttypes.Notification()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20554,7 +20819,7 @@ class getAllNotifications_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -20573,7 +20838,7 @@ class getAllNotifications_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20633,11 +20898,11 @@ class getAllNotifications_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.workspace.ttypes.Notification, apache.airavata.model.workspace.ttypes.Notification.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Notification, airavata.model.workspace.ttypes.Notification.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -20661,7 +20926,7 @@ class getAllNotifications_result(object):
                     self.success = []
                     (_etype17, _size14) = iprot.readListBegin()
                     for _i18 in range(_size14):
-                        _elem19 = apache.airavata.model.workspace.ttypes.Notification()
+                        _elem19 = airavata.model.workspace.ttypes.Notification()
                         _elem19.read(iprot)
                         self.success.append(_elem19)
                     iprot.readListEnd()
@@ -20669,25 +20934,25 @@ class getAllNotifications_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20754,7 +21019,7 @@ class generateAndRegisterSSHKeys_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'userName', 'UTF8', None, ),  # 3
         (4, TType.STRING, 'description', 'UTF8', None, ),  # 4
@@ -20779,7 +21044,7 @@ class generateAndRegisterSSHKeys_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20868,9 +21133,9 @@ class generateAndRegisterSSHKeys_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -20895,19 +21160,19 @@ class generateAndRegisterSSHKeys_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -20968,7 +21233,7 @@ class registerPwdCredential_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'portalUserName', 'UTF8', None, ),  # 3
         (4, TType.STRING, 'loginUserName', 'UTF8', None, ),  # 4
@@ -20995,7 +21260,7 @@ class registerPwdCredential_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21099,9 +21364,9 @@ class registerPwdCredential_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -21126,19 +21391,19 @@ class registerPwdCredential_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21196,7 +21461,7 @@ class getSSHPubKey_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
@@ -21217,7 +21482,7 @@ class getSSHPubKey_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21288,9 +21553,9 @@ class getSSHPubKey_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -21315,19 +21580,19 @@ class getSSHPubKey_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21384,7 +21649,7 @@ class getAllGatewaySSHPubKeys_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -21403,7 +21668,7 @@ class getAllGatewaySSHPubKeys_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21463,9 +21728,9 @@ class getAllGatewaySSHPubKeys_result(object):
 
     thrift_spec = (
         (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -21496,19 +21761,19 @@ class getAllGatewaySSHPubKeys_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21570,7 +21835,7 @@ class getAllCredentialSummaryForGateway_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.I32, 'type', None, None, ),  # 2
         (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
@@ -21591,7 +21856,7 @@ class getAllCredentialSummaryForGateway_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21661,10 +21926,10 @@ class getAllCredentialSummaryForGateway_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (credential_store_data_models.ttypes.CredentialSummary, credential_store_data_models.ttypes.CredentialSummary.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.credential.store.ttypes.CredentialSummary, airavata.model.credential.store.ttypes.CredentialSummary.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -21687,7 +21952,7 @@ class getAllCredentialSummaryForGateway_result(object):
                     self.success = []
                     (_etype33, _size30) = iprot.readListBegin()
                     for _i34 in range(_size30):
-                        _elem35 = credential_store_data_models.ttypes.CredentialSummary()
+                        _elem35 = airavata.model.credential.store.ttypes.CredentialSummary()
                         _elem35.read(iprot)
                         self.success.append(_elem35)
                     iprot.readListEnd()
@@ -21695,19 +21960,19 @@ class getAllCredentialSummaryForGateway_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21769,7 +22034,7 @@ class getAllCredentialSummaryForUsersInGateway_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.I32, 'type', None, None, ),  # 2
         (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
         (4, TType.STRING, 'userId', 'UTF8', None, ),  # 4
@@ -21792,7 +22057,7 @@ class getAllCredentialSummaryForUsersInGateway_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21873,10 +22138,10 @@ class getAllCredentialSummaryForUsersInGateway_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (credential_store_data_models.ttypes.CredentialSummary, credential_store_data_models.ttypes.CredentialSummary.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.credential.store.ttypes.CredentialSummary, airavata.model.credential.store.ttypes.CredentialSummary.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -21899,7 +22164,7 @@ class getAllCredentialSummaryForUsersInGateway_result(object):
                     self.success = []
                     (_etype40, _size37) = iprot.readListBegin()
                     for _i41 in range(_size37):
-                        _elem42 = credential_store_data_models.ttypes.CredentialSummary()
+                        _elem42 = airavata.model.credential.store.ttypes.CredentialSummary()
                         _elem42.read(iprot)
                         self.success.append(_elem42)
                     iprot.readListEnd()
@@ -21907,19 +22172,19 @@ class getAllCredentialSummaryForUsersInGateway_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -21979,7 +22244,7 @@ class getAllGatewayPWDCredentials_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -21998,7 +22263,7 @@ class getAllGatewayPWDCredentials_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22058,9 +22323,9 @@ class getAllGatewayPWDCredentials_result(object):
 
     thrift_spec = (
         (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -22091,19 +22356,19 @@ class getAllGatewayPWDCredentials_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22165,7 +22430,7 @@ class deleteSSHPubKey_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
@@ -22186,7 +22451,7 @@ class deleteSSHPubKey_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22257,9 +22522,9 @@ class deleteSSHPubKey_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -22284,19 +22549,19 @@ class deleteSSHPubKey_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22354,7 +22619,7 @@ class deletePWDCredential_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
@@ -22375,7 +22640,7 @@ class deletePWDCredential_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22446,9 +22711,9 @@ class deletePWDCredential_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None,):
@@ -22473,19 +22738,19 @@ class deletePWDCredential_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22543,9 +22808,9 @@ class createProject_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'project', (apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'project', (airavata.model.workspace.ttypes.Project, airavata.model.workspace.ttypes.Project.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, gatewayId=None, project=None,):
@@ -22564,7 +22829,7 @@ class createProject_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22575,7 +22840,7 @@ class createProject_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.project = apache.airavata.model.workspace.ttypes.Project()
+                    self.project = airavata.model.workspace.ttypes.Project()
                     self.project.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22637,10 +22902,10 @@ class createProject_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -22666,25 +22931,25 @@ class createProject_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22746,9 +23011,9 @@ class updateProject_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'projectId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'updatedProject', (apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'updatedProject', (airavata.model.workspace.ttypes.Project, airavata.model.workspace.ttypes.Project.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, projectId=None, updatedProject=None,):
@@ -22767,7 +23032,7 @@ class updateProject_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22778,7 +23043,7 @@ class updateProject_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.updatedProject = apache.airavata.model.workspace.ttypes.Project()
+                    self.updatedProject = airavata.model.workspace.ttypes.Project()
                     self.updatedProject.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22840,11 +23105,11 @@ class updateProject_result(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'pnfe', (apache.airavata.api.error.ttypes.ProjectNotFoundException, apache.airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'pnfe', (airavata.api.error.ttypes.ProjectNotFoundException, airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, ire=None, ace=None, ase=None, pnfe=None, ae=None,):
@@ -22865,31 +23130,31 @@ class updateProject_result(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
+                    self.pnfe = airavata.api.error.ttypes.ProjectNotFoundException()
                     self.pnfe.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -22950,7 +23215,7 @@ class getProject_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'projectId', 'UTF8', None, ),  # 2
     )
 
@@ -22969,7 +23234,7 @@ class getProject_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23030,12 +23295,12 @@ class getProject_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'pnfe', (apache.airavata.api.error.ttypes.ProjectNotFoundException, apache.airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.STRUCT, 'success', (airavata.model.workspace.ttypes.Project, airavata.model.workspace.ttypes.Project.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'pnfe', (airavata.api.error.ttypes.ProjectNotFoundException, airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, pnfe=None, ae=None,):
@@ -23057,37 +23322,37 @@ class getProject_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.workspace.ttypes.Project()
+                    self.success = airavata.model.workspace.ttypes.Project()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
+                    self.pnfe = airavata.api.error.ttypes.ProjectNotFoundException()
                     self.pnfe.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23152,7 +23417,7 @@ class deleteProject_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'projectId', 'UTF8', None, ),  # 2
     )
 
@@ -23171,7 +23436,7 @@ class deleteProject_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23233,11 +23498,11 @@ class deleteProject_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'pnfe', (apache.airavata.api.error.ttypes.ProjectNotFoundException, apache.airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'pnfe', (airavata.api.error.ttypes.ProjectNotFoundException, airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, pnfe=None, ae=None,):
@@ -23264,31 +23529,31 @@ class deleteProject_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
+                    self.pnfe = airavata.api.error.ttypes.ProjectNotFoundException()
                     self.pnfe.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23356,7 +23621,7 @@ class getUserProjects_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'userName', 'UTF8', None, ),  # 3
         (4, TType.I32, 'limit', None, None, ),  # 4
@@ -23381,7 +23646,7 @@ class getUserProjects_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23474,11 +23739,11 @@ class getUserProjects_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Project, airavata.model.workspace.ttypes.Project.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -23502,7 +23767,7 @@ class getUserProjects_result(object):
                     self.success = []
                     (_etype56, _size53) = iprot.readListBegin()
                     for _i57 in range(_size53):
-                        _elem58 = apache.airavata.model.workspace.ttypes.Project()
+                        _elem58 = airavata.model.workspace.ttypes.Project()
                         _elem58.read(iprot)
                         self.success.append(_elem58)
                     iprot.readListEnd()
@@ -23510,25 +23775,25 @@ class getUserProjects_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23596,7 +23861,7 @@ class searchProjects_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'userName', 'UTF8', None, ),  # 3
         (4, TType.MAP, 'filters', (TType.I32, None, TType.STRING, 'UTF8', False), None, ),  # 4
@@ -23623,7 +23888,7 @@ class searchProjects_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23735,11 +24000,11 @@ class searchProjects_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.workspace.ttypes.Project, apache.airavata.model.workspace.ttypes.Project.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.workspace.ttypes.Project, airavata.model.workspace.ttypes.Project.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -23763,7 +24028,7 @@ class searchProjects_result(object):
                     self.success = []
                     (_etype72, _size69) = iprot.readListBegin()
                     for _i73 in range(_size69):
-                        _elem74 = apache.airavata.model.workspace.ttypes.Project()
+                        _elem74 = airavata.model.workspace.ttypes.Project()
                         _elem74.read(iprot)
                         self.success.append(_elem74)
                     iprot.readListEnd()
@@ -23771,25 +24036,25 @@ class searchProjects_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23857,7 +24122,7 @@ class searchExperiments_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'userName', 'UTF8', None, ),  # 3
         (4, TType.MAP, 'filters', (TType.I32, None, TType.STRING, 'UTF8', False), None, ),  # 4
@@ -23884,7 +24149,7 @@ class searchExperiments_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -23996,11 +24261,11 @@ class searchExperiments_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.experiment.ttypes.ExperimentSummaryModel, apache.airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.experiment.ttypes.ExperimentSummaryModel, airavata.model.experiment.ttypes.ExperimentSummaryModel.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -24024,7 +24289,7 @@ class searchExperiments_result(object):
                     self.success = []
                     (_etype88, _size85) = iprot.readListBegin()
                     for _i89 in range(_size85):
-                        _elem90 = apache.airavata.model.experiment.ttypes.ExperimentSummaryModel()
+                        _elem90 = airavata.model.experiment.ttypes.ExperimentSummaryModel()
                         _elem90.read(iprot)
                         self.success.append(_elem90)
                     iprot.readListEnd()
@@ -24032,25 +24297,25 @@ class searchExperiments_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24119,7 +24384,7 @@ class getExperimentStatistics_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.I64, 'fromTime', None, None, ),  # 3
         (4, TType.I64, 'toTime', None, None, ),  # 4
@@ -24148,7 +24413,7 @@ class getExperimentStatistics_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24257,11 +24522,11 @@ class getExperimentStatistics_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.experiment.ttypes.ExperimentStatistics, apache.airavata.model.experiment.ttypes.ExperimentStatistics.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.experiment.ttypes.ExperimentStatistics, airavata.model.experiment.ttypes.ExperimentStatistics.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -24282,31 +24547,31 @@ class getExperimentStatistics_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.experiment.ttypes.ExperimentStatistics()
+                    self.success = airavata.model.experiment.ttypes.ExperimentStatistics()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24369,7 +24634,7 @@ class getExperimentsInProject_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'projectId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'limit', None, None, ),  # 3
         (4, TType.I32, 'offset', None, None, ),  # 4
@@ -24392,7 +24657,7 @@ class getExperimentsInProject_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24475,12 +24740,12 @@ class getExperimentsInProject_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'pnfe', (apache.airavata.api.error.ttypes.ProjectNotFoundException, apache.airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.experiment.ttypes.ExperimentModel, airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'pnfe', (airavata.api.error.ttypes.ProjectNotFoundException, airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, pnfe=None, ae=None,):
@@ -24505,7 +24770,7 @@ class getExperimentsInProject_result(object):
                     self.success = []
                     (_etype95, _size92) = iprot.readListBegin()
                     for _i96 in range(_size92):
-                        _elem97 = apache.airavata.model.experiment.ttypes.ExperimentModel()
+                        _elem97 = airavata.model.experiment.ttypes.ExperimentModel()
                         _elem97.read(iprot)
                         self.success.append(_elem97)
                     iprot.readListEnd()
@@ -24513,31 +24778,31 @@ class getExperimentsInProject_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
+                    self.pnfe = airavata.api.error.ttypes.ProjectNotFoundException()
                     self.pnfe.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24608,7 +24873,7 @@ class getUserExperiments_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'userName', 'UTF8', None, ),  # 3
         (4, TType.I32, 'limit', None, None, ),  # 4
@@ -24633,7 +24898,7 @@ class getUserExperiments_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24726,11 +24991,11 @@ class getUserExperiments_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.experiment.ttypes.ExperimentModel, airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -24754,7 +25019,7 @@ class getUserExperiments_result(object):
                     self.success = []
                     (_etype102, _size99) = iprot.readListBegin()
                     for _i103 in range(_size99):
-                        _elem104 = apache.airavata.model.experiment.ttypes.ExperimentModel()
+                        _elem104 = airavata.model.experiment.ttypes.ExperimentModel()
                         _elem104.read(iprot)
                         self.success.append(_elem104)
                     iprot.readListEnd()
@@ -24762,25 +25027,25 @@ class getUserExperiments_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24845,9 +25110,9 @@ class createExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'experiment', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'experiment', (airavata.model.experiment.ttypes.ExperimentModel, airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, gatewayId=None, experiment=None,):
@@ -24866,7 +25131,7 @@ class createExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24877,7 +25142,7 @@ class createExperiment_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.experiment = apache.airavata.model.experiment.ttypes.ExperimentModel()
+                    self.experiment = airavata.model.experiment.ttypes.ExperimentModel()
                     self.experiment.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -24939,10 +25204,10 @@ class createExperiment_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -24968,25 +25233,25 @@ class createExperiment_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25047,7 +25312,7 @@ class deleteExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'experimentId', 'UTF8', None, ),  # 2
     )
 
@@ -25066,7 +25331,7 @@ class deleteExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25127,10 +25392,10 @@ class deleteExperiment_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -25156,25 +25421,25 @@ class deleteExperiment_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25235,7 +25500,7 @@ class getExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -25254,7 +25519,7 @@ class getExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25315,12 +25580,12 @@ class getExperiment_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.STRUCT, 'success', (airavata.model.experiment.ttypes.ExperimentModel, airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -25342,37 +25607,37 @@ class getExperiment_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.experiment.ttypes.ExperimentModel()
+                    self.success = airavata.model.experiment.ttypes.ExperimentModel()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25437,7 +25702,7 @@ class getExperimentByAdmin_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -25456,7 +25721,7 @@ class getExperimentByAdmin_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25517,12 +25782,12 @@ class getExperimentByAdmin_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.STRUCT, 'success', (airavata.model.experiment.ttypes.ExperimentModel, airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -25544,37 +25809,37 @@ class getExperimentByAdmin_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.experiment.ttypes.ExperimentModel()
+                    self.success = airavata.model.experiment.ttypes.ExperimentModel()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25639,7 +25904,7 @@ class getDetailedExperimentTree_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -25658,7 +25923,7 @@ class getDetailedExperimentTree_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25719,12 +25984,12 @@ class getDetailedExperimentTree_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.STRUCT, 'success', (airavata.model.experiment.ttypes.ExperimentModel, airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -25746,37 +26011,37 @@ class getDetailedExperimentTree_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.experiment.ttypes.ExperimentModel()
+                    self.success = airavata.model.experiment.ttypes.ExperimentModel()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25842,9 +26107,9 @@ class updateExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'experiment', (apache.airavata.model.experiment.ttypes.ExperimentModel, apache.airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'experiment', (airavata.model.experiment.ttypes.ExperimentModel, airavata.model.experiment.ttypes.ExperimentModel.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, airavataExperimentId=None, experiment=None,):
@@ -25863,7 +26128,7 @@ class updateExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25874,7 +26139,7 @@ class updateExperiment_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.experiment = apache.airavata.model.experiment.ttypes.ExperimentModel()
+                    self.experiment = airavata.model.experiment.ttypes.ExperimentModel()
                     self.experiment.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -25936,11 +26201,11 @@ class updateExperiment_result(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -25961,31 +26226,31 @@ class updateExperiment_result(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26047,9 +26312,9 @@ class updateExperimentConfiguration_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'userConfiguration', (apache.airavata.model.experiment.ttypes.UserConfigurationDataModel, apache.airavata.model.experiment.ttypes.UserConfigurationDataModel.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'userConfiguration', (airavata.model.experiment.ttypes.UserConfigurationDataModel, airavata.model.experiment.ttypes.UserConfigurationDataModel.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, airavataExperimentId=None, userConfiguration=None,):
@@ -26068,7 +26333,7 @@ class updateExperimentConfiguration_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26079,7 +26344,7 @@ class updateExperimentConfiguration_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.userConfiguration = apache.airavata.model.experiment.ttypes.UserConfigurationDataModel()
+                    self.userConfiguration = airavata.model.experiment.ttypes.UserConfigurationDataModel()
                     self.userConfiguration.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26137,7 +26402,7 @@ class updateExperimentConfiguration_result(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, ae=None,):
@@ -26154,7 +26419,7 @@ class updateExperimentConfiguration_result(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26200,9 +26465,9 @@ class updateResourceScheduleing_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'resourceScheduling', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'resourceScheduling', (airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, airavataExperimentId=None, resourceScheduling=None,):
@@ -26221,7 +26486,7 @@ class updateResourceScheduleing_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26232,7 +26497,7 @@ class updateResourceScheduleing_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.resourceScheduling = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
+                    self.resourceScheduling = airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
                     self.resourceScheduling.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26290,7 +26555,7 @@ class updateResourceScheduleing_result(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, ae=None,):
@@ -26307,7 +26572,7 @@ class updateResourceScheduleing_result(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26352,7 +26617,7 @@ class validateExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -26371,7 +26636,7 @@ class validateExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26433,11 +26698,11 @@ class validateExperiment_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -26464,31 +26729,31 @@ class validateExperiment_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26554,7 +26819,7 @@ class launchExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
@@ -26575,7 +26840,7 @@ class launchExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26647,11 +26912,11 @@ class launchExperiment_result(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -26672,31 +26937,31 @@ class launchExperiment_result(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26757,7 +27022,7 @@ class getExperimentStatus_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -26776,7 +27041,7 @@ class getExperimentStatus_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26837,12 +27102,12 @@ class getExperimentStatus_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.STRUCT, 'success', (airavata.model.status.ttypes.ExperimentStatus, airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -26864,37 +27129,37 @@ class getExperimentStatus_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.status.ttypes.ExperimentStatus()
+                    self.success = airavata.model.status.ttypes.ExperimentStatus()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -26959,7 +27224,7 @@ class getExperimentOutputs_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -26978,7 +27243,7 @@ class getExperimentOutputs_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27039,12 +27304,12 @@ class getExperimentOutputs_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -27069,7 +27334,7 @@ class getExperimentOutputs_result(object):
                     self.success = []
                     (_etype109, _size106) = iprot.readListBegin()
                     for _i110 in range(_size106):
-                        _elem111 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem111 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem111.read(iprot)
                         self.success.append(_elem111)
                     iprot.readListEnd()
@@ -27077,31 +27342,31 @@ class getExperimentOutputs_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27169,7 +27434,7 @@ class getIntermediateOutputs_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -27188,7 +27453,7 @@ class getIntermediateOutputs_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27249,12 +27514,12 @@ class getIntermediateOutputs_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -27279,7 +27544,7 @@ class getIntermediateOutputs_result(object):
                     self.success = []
                     (_etype116, _size113) = iprot.readListBegin()
                     for _i117 in range(_size113):
-                        _elem118 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem118 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem118.read(iprot)
                         self.success.append(_elem118)
                     iprot.readListEnd()
@@ -27287,31 +27552,31 @@ class getIntermediateOutputs_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27379,7 +27644,7 @@ class getJobStatuses_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -27398,7 +27663,7 @@ class getJobStatuses_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27459,12 +27724,12 @@ class getJobStatuses_result(object):
     """
 
     thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRUCT, (apache.airavata.model.status.ttypes.JobStatus, apache.airavata.model.status.ttypes.JobStatus.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRUCT, (airavata.model.status.ttypes.JobStatus, airavata.model.status.ttypes.JobStatus.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -27490,7 +27755,7 @@ class getJobStatuses_result(object):
                     (_ktype121, _vtype122, _size120) = iprot.readMapBegin()
                     for _i124 in range(_size120):
                         _key125 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        _val126 = apache.airavata.model.status.ttypes.JobStatus()
+                        _val126 = airavata.model.status.ttypes.JobStatus()
                         _val126.read(iprot)
                         self.success[_key125] = _val126
                     iprot.readMapEnd()
@@ -27498,31 +27763,31 @@ class getJobStatuses_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27591,7 +27856,7 @@ class getJobDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
     )
 
@@ -27610,7 +27875,7 @@ class getJobDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27671,12 +27936,12 @@ class getJobDetails_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.job.ttypes.JobModel, apache.airavata.model.job.ttypes.JobModel.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.job.ttypes.JobModel, airavata.model.job.ttypes.JobModel.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -27701,7 +27966,7 @@ class getJobDetails_result(object):
                     self.success = []
                     (_etype132, _size129) = iprot.readListBegin()
                     for _i133 in range(_size129):
-                        _elem134 = apache.airavata.model.job.ttypes.JobModel()
+                        _elem134 = airavata.model.job.ttypes.JobModel()
                         _elem134.read(iprot)
                         self.success.append(_elem134)
                     iprot.readListEnd()
@@ -27709,31 +27974,31 @@ class getJobDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27803,7 +28068,7 @@ class cloneExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'existingExperimentID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'newExperimentName', 'UTF8', None, ),  # 3
         (4, TType.STRING, 'newExperimentProjectId', 'UTF8', None, ),  # 4
@@ -27826,7 +28091,7 @@ class cloneExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -27905,12 +28170,12 @@ class cloneExperiment_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
-        (6, TType.STRUCT, 'pnfe', (apache.airavata.api.error.ttypes.ProjectNotFoundException, apache.airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 6
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (6, TType.STRUCT, 'pnfe', (airavata.api.error.ttypes.ProjectNotFoundException, airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 6
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None, pnfe=None,):
@@ -27938,37 +28203,37 @@ class cloneExperiment_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 6:
                 if ftype == TType.STRUCT:
-                    self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
+                    self.pnfe = airavata.api.error.ttypes.ProjectNotFoundException()
                     self.pnfe.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28039,7 +28304,7 @@ class cloneExperimentByAdmin_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'existingExperimentID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'newExperimentName', 'UTF8', None, ),  # 3
         (4, TType.STRING, 'newExperimentProjectId', 'UTF8', None, ),  # 4
@@ -28062,7 +28327,7 @@ class cloneExperimentByAdmin_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28141,12 +28406,12 @@ class cloneExperimentByAdmin_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
-        (6, TType.STRUCT, 'pnfe', (apache.airavata.api.error.ttypes.ProjectNotFoundException, apache.airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 6
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (6, TType.STRUCT, 'pnfe', (airavata.api.error.ttypes.ProjectNotFoundException, airavata.api.error.ttypes.ProjectNotFoundException.thrift_spec), None, ),  # 6
     )
 
     def __init__(self, success=None, ire=None, enf=None, ace=None, ase=None, ae=None, pnfe=None,):
@@ -28174,37 +28439,37 @@ class cloneExperimentByAdmin_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 6:
                 if ftype == TType.STRUCT:
-                    self.pnfe = apache.airavata.api.error.ttypes.ProjectNotFoundException()
+                    self.pnfe = airavata.api.error.ttypes.ProjectNotFoundException()
                     self.pnfe.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28274,7 +28539,7 @@ class terminateExperiment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'airavataExperimentId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 3
     )
@@ -28295,7 +28560,7 @@ class terminateExperiment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28363,11 +28628,11 @@ class terminateExperiment_result(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'enf', (apache.airavata.api.error.ttypes.ExperimentNotFoundException, apache.airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
-        (5, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'enf', (airavata.api.error.ttypes.ExperimentNotFoundException, airavata.api.error.ttypes.ExperimentNotFoundException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 4
+        (5, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, ire=None, enf=None, ace=None, ase=None, ae=None,):
@@ -28388,31 +28653,31 @@ class terminateExperiment_result(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.enf = apache.airavata.api.error.ttypes.ExperimentNotFoundException()
+                    self.enf = airavata.api.error.ttypes.ExperimentNotFoundException()
                     self.enf.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28474,9 +28739,9 @@ class registerApplicationModule_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'applicationModule', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'applicationModule', (airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, gatewayId=None, applicationModule=None,):
@@ -28495,7 +28760,7 @@ class registerApplicationModule_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28506,7 +28771,7 @@ class registerApplicationModule_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.applicationModule = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+                    self.applicationModule = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
                     self.applicationModule.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28568,10 +28833,10 @@ class registerApplicationModule_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -28597,25 +28862,25 @@ class registerApplicationModule_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28676,7 +28941,7 @@ class getApplicationModule_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appModuleId', 'UTF8', None, ),  # 2
     )
 
@@ -28695,7 +28960,7 @@ class getApplicationModule_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28755,11 +29020,11 @@ class getApplicationModule_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -28780,31 +29045,31 @@ class getApplicationModule_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+                    self.success = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28866,9 +29131,9 @@ class updateApplicationModule_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appModuleId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'applicationModule', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'applicationModule', (airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, appModuleId=None, applicationModule=None,):
@@ -28887,7 +29152,7 @@ class updateApplicationModule_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28898,7 +29163,7 @@ class updateApplicationModule_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.applicationModule = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+                    self.applicationModule = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
                     self.applicationModule.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -28960,10 +29225,10 @@ class updateApplicationModule_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -28989,25 +29254,25 @@ class updateApplicationModule_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29068,7 +29333,7 @@ class getAllAppModules_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -29087,7 +29352,7 @@ class getAllAppModules_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29147,11 +29412,11 @@ class getAllAppModules_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule, airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -29175,7 +29440,7 @@ class getAllAppModules_result(object):
                     self.success = []
                     (_etype139, _size136) = iprot.readListBegin()
                     for _i140 in range(_size136):
-                        _elem141 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
+                        _elem141 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationModule()
                         _elem141.read(iprot)
                         self.success.append(_elem141)
                     iprot.readListEnd()
@@ -29183,25 +29448,25 @@ class getAllAppModules_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29265,7 +29530,7 @@ class deleteApplicationModule_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appModuleId', 'UTF8', None, ),  # 2
     )
 
@@ -29284,7 +29549,7 @@ class deleteApplicationModule_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29345,10 +29610,10 @@ class deleteApplicationModule_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -29374,25 +29639,25 @@ class deleteApplicationModule_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29454,9 +29719,9 @@ class registerApplicationDeployment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'applicationDeployment', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'applicationDeployment', (airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, gatewayId=None, applicationDeployment=None,):
@@ -29475,7 +29740,7 @@ class registerApplicationDeployment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29486,7 +29751,7 @@ class registerApplicationDeployment_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.applicationDeployment = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+                    self.applicationDeployment = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
                     self.applicationDeployment.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29548,10 +29813,10 @@ class registerApplicationDeployment_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -29577,25 +29842,25 @@ class registerApplicationDeployment_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29656,7 +29921,7 @@ class getApplicationDeployment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appDeploymentId', 'UTF8', None, ),  # 2
     )
 
@@ -29675,7 +29940,7 @@ class getApplicationDeployment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29735,11 +30000,11 @@ class getApplicationDeployment_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -29760,31 +30025,31 @@ class getApplicationDeployment_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+                    self.success = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29846,9 +30111,9 @@ class updateApplicationDeployment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appDeploymentId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'applicationDeployment', (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'applicationDeployment', (airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, appDeploymentId=None, applicationDeployment=None,):
@@ -29867,7 +30132,7 @@ class updateApplicationDeployment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29878,7 +30143,7 @@ class updateApplicationDeployment_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.applicationDeployment = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+                    self.applicationDeployment = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
                     self.applicationDeployment.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -29940,10 +30205,10 @@ class updateApplicationDeployment_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -29969,25 +30234,25 @@ class updateApplicationDeployment_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30048,7 +30313,7 @@ class deleteApplicationDeployment_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appDeploymentId', 'UTF8', None, ),  # 2
     )
 
@@ -30067,7 +30332,7 @@ class deleteApplicationDeployment_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30128,10 +30393,10 @@ class deleteApplicationDeployment_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -30157,25 +30422,25 @@ class deleteApplicationDeployment_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30236,7 +30501,7 @@ class getAllApplicationDeployments_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -30255,7 +30520,7 @@ class getAllApplicationDeployments_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30315,11 +30580,11 @@ class getAllApplicationDeployments_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription, airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -30343,7 +30608,7 @@ class getAllApplicationDeployments_result(object):
                     self.success = []
                     (_etype146, _size143) = iprot.readListBegin()
                     for _i147 in range(_size143):
-                        _elem148 = apache.airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
+                        _elem148 = airavata.model.appcatalog.appdeployment.ttypes.ApplicationDeploymentDescription()
                         _elem148.read(iprot)
                         self.success.append(_elem148)
                     iprot.readListEnd()
@@ -30351,25 +30616,25 @@ class getAllApplicationDeployments_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30433,7 +30698,7 @@ class getAppModuleDeployedResources_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appModuleId', 'UTF8', None, ),  # 2
     )
 
@@ -30452,7 +30717,7 @@ class getAppModuleDeployedResources_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30513,10 +30778,10 @@ class getAppModuleDeployedResources_result(object):
 
     thrift_spec = (
         (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -30547,25 +30812,25 @@ class getAppModuleDeployedResources_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30630,9 +30895,9 @@ class registerApplicationInterface_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'applicationInterface', (apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'applicationInterface', (airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, gatewayId=None, applicationInterface=None,):
@@ -30651,7 +30916,7 @@ class registerApplicationInterface_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30662,7 +30927,7 @@ class registerApplicationInterface_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.applicationInterface = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
+                    self.applicationInterface = airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
                     self.applicationInterface.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30724,10 +30989,10 @@ class registerApplicationInterface_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -30753,25 +31018,25 @@ class registerApplicationInterface_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30834,7 +31099,7 @@ class cloneApplicationInterface_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'existingAppInterfaceID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'newApplicationName', 'UTF8', None, ),  # 3
         (4, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 4
@@ -30857,7 +31122,7 @@ class cloneApplicationInterface_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -30934,10 +31199,10 @@ class cloneApplicationInterface_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -30963,25 +31228,25 @@ class cloneApplicationInterface_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31042,7 +31307,7 @@ class getApplicationInterface_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appInterfaceId', 'UTF8', None, ),  # 2
     )
 
@@ -31061,7 +31326,7 @@ class getApplicationInterface_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31121,11 +31386,11 @@ class getApplicationInterface_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -31146,31 +31411,31 @@ class getApplicationInterface_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
+                    self.success = airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31232,9 +31497,9 @@ class updateApplicationInterface_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'applicationInterface', (apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'applicationInterface', (airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, appInterfaceId=None, applicationInterface=None,):
@@ -31253,7 +31518,7 @@ class updateApplicationInterface_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31264,7 +31529,7 @@ class updateApplicationInterface_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.applicationInterface = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
+                    self.applicationInterface = airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
                     self.applicationInterface.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31326,10 +31591,10 @@ class updateApplicationInterface_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -31355,25 +31620,25 @@ class updateApplicationInterface_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31434,7 +31699,7 @@ class deleteApplicationInterface_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appInterfaceId', 'UTF8', None, ),  # 2
     )
 
@@ -31453,7 +31718,7 @@ class deleteApplicationInterface_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31514,10 +31779,10 @@ class deleteApplicationInterface_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -31543,25 +31808,25 @@ class deleteApplicationInterface_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31622,7 +31887,7 @@ class getAllApplicationInterfaceNames_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -31641,7 +31906,7 @@ class getAllApplicationInterfaceNames_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31702,10 +31967,10 @@ class getAllApplicationInterfaceNames_result(object):
 
     thrift_spec = (
         (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -31737,25 +32002,25 @@ class getAllApplicationInterfaceNames_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31820,7 +32085,7 @@ class getAllApplicationInterfaces_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
@@ -31839,7 +32104,7 @@ class getAllApplicationInterfaces_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -31899,11 +32164,11 @@ class getAllApplicationInterfaces_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription, airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -31927,7 +32192,7 @@ class getAllApplicationInterfaces_result(object):
                     self.success = []
                     (_etype169, _size166) = iprot.readListBegin()
                     for _i170 in range(_size166):
-                        _elem171 = apache.airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
+                        _elem171 = airavata.model.appcatalog.appinterface.ttypes.ApplicationInterfaceDescription()
                         _elem171.read(iprot)
                         self.success.append(_elem171)
                     iprot.readListEnd()
@@ -31935,25 +32200,25 @@ class getAllApplicationInterfaces_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32017,7 +32282,7 @@ class getApplicationInputs_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appInterfaceId', 'UTF8', None, ),  # 2
     )
 
@@ -32036,7 +32301,7 @@ class getApplicationInputs_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32096,11 +32361,11 @@ class getApplicationInputs_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -32124,7 +32389,7 @@ class getApplicationInputs_result(object):
                     self.success = []
                     (_etype176, _size173) = iprot.readListBegin()
                     for _i177 in range(_size173):
-                        _elem178 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+                        _elem178 = airavata.model.application.io.ttypes.InputDataObjectType()
                         _elem178.read(iprot)
                         self.success.append(_elem178)
                     iprot.readListEnd()
@@ -32132,25 +32397,25 @@ class getApplicationInputs_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32214,7 +32479,7 @@ class getApplicationOutputs_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appInterfaceId', 'UTF8', None, ),  # 2
     )
 
@@ -32233,7 +32498,7 @@ class getApplicationOutputs_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32293,11 +32558,11 @@ class getApplicationOutputs_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -32321,7 +32586,7 @@ class getApplicationOutputs_result(object):
                     self.success = []
                     (_etype183, _size180) = iprot.readListBegin()
                     for _i184 in range(_size180):
-                        _elem185 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem185 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem185.read(iprot)
                         self.success.append(_elem185)
                     iprot.readListEnd()
@@ -32329,25 +32594,25 @@ class getApplicationOutputs_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32411,7 +32676,7 @@ class getAvailableAppInterfaceComputeResources_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'appInterfaceId', 'UTF8', None, ),  # 2
     )
 
@@ -32430,7 +32695,7 @@ class getAvailableAppInterfaceComputeResources_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32491,10 +32756,10 @@ class getAvailableAppInterfaceComputeResources_result(object):
 
     thrift_spec = (
         (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -32526,25 +32791,25 @@ class getAvailableAppInterfaceComputeResources_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32609,8 +32874,8 @@ class registerComputeResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'computeResourceDescription', (apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription, apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'computeResourceDescription', (airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription, airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, computeResourceDescription=None,):
@@ -32628,13 +32893,13 @@ class registerComputeResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.computeResourceDescription = apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription()
+                    self.computeResourceDescription = airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription()
                     self.computeResourceDescription.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32690,10 +32955,10 @@ class registerComputeResource_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -32719,25 +32984,25 @@ class registerComputeResource_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32798,7 +33063,7 @@ class getComputeResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
     )
 
@@ -32817,7 +33082,7 @@ class getComputeResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32877,11 +33142,11 @@ class getComputeResource_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription, apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription, airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -32902,31 +33167,31 @@ class getComputeResource_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription()
+                    self.success = airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -32986,7 +33251,7 @@ class getAllComputeResourceNames_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, authzToken=None,):
@@ -33003,7 +33268,7 @@ class getAllComputeResourceNames_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33053,10 +33318,10 @@ class getAllComputeResourceNames_result(object):
 
     thrift_spec = (
         (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -33088,25 +33353,25 @@ class getAllComputeResourceNames_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33172,9 +33437,9 @@ class updateComputeResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'computeResourceDescription', (apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription, apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'computeResourceDescription', (airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription, airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, computeResourceId=None, computeResourceDescription=None,):
@@ -33193,7 +33458,7 @@ class updateComputeResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33204,7 +33469,7 @@ class updateComputeResource_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.computeResourceDescription = apache.airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription()
+                    self.computeResourceDescription = airavata.model.appcatalog.computeresource.ttypes.ComputeResourceDescription()
                     self.computeResourceDescription.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33266,10 +33531,10 @@ class updateComputeResource_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -33295,25 +33560,25 @@ class updateComputeResource_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33374,7 +33639,7 @@ class deleteComputeResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
     )
 
@@ -33393,7 +33658,7 @@ class deleteComputeResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33454,10 +33719,10 @@ class deleteComputeResource_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -33483,25 +33748,25 @@ class deleteComputeResource_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33562,8 +33827,8 @@ class registerStorageResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'storageResourceDescription', (apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription, apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'storageResourceDescription', (airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription, airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, storageResourceDescription=None,):
@@ -33581,13 +33846,13 @@ class registerStorageResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.storageResourceDescription = apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription()
+                    self.storageResourceDescription = airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription()
                     self.storageResourceDescription.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33643,10 +33908,10 @@ class registerStorageResource_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -33672,25 +33937,25 @@ class registerStorageResource_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33751,7 +34016,7 @@ class getStorageResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'storageResourceId', 'UTF8', None, ),  # 2
     )
 
@@ -33770,7 +34035,7 @@ class getStorageResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33830,11 +34095,11 @@ class getStorageResource_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription, apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription, airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -33855,31 +34120,31 @@ class getStorageResource_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription()
+                    self.success = airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -33939,7 +34204,7 @@ class getAllStorageResourceNames_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, authzToken=None,):
@@ -33956,7 +34221,7 @@ class getAllStorageResourceNames_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34006,10 +34271,10 @@ class getAllStorageResourceNames_result(object):
 
     thrift_spec = (
         (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -34041,25 +34306,25 @@ class getAllStorageResourceNames_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34125,9 +34390,9 @@ class updateStorageResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'storageResourceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'storageResourceDescription', (apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription, apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'storageResourceDescription', (airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription, airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, storageResourceId=None, storageResourceDescription=None,):
@@ -34146,7 +34411,7 @@ class updateStorageResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34157,7 +34422,7 @@ class updateStorageResource_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.storageResourceDescription = apache.airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription()
+                    self.storageResourceDescription = airavata.model.appcatalog.storageresource.ttypes.StorageResourceDescription()
                     self.storageResourceDescription.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34219,10 +34484,10 @@ class updateStorageResource_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -34248,25 +34513,25 @@ class updateStorageResource_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34327,7 +34592,7 @@ class deleteStorageResource_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'storageResourceId', 'UTF8', None, ),  # 2
     )
 
@@ -34346,7 +34611,7 @@ class deleteStorageResource_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34407,10 +34672,10 @@ class deleteStorageResource_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -34436,25 +34701,25 @@ class deleteStorageResource_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34517,10 +34782,10 @@ class addLocalSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'priorityOrder', None, None, ),  # 3
-        (4, TType.STRUCT, 'localSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'localSubmission', (airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission, airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, localSubmission=None,):
@@ -34540,7 +34805,7 @@ class addLocalSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34556,7 +34821,7 @@ class addLocalSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.localSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission()
+                    self.localSubmission = airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission()
                     self.localSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34624,10 +34889,10 @@ class addLocalSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -34653,25 +34918,25 @@ class addLocalSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34733,9 +34998,9 @@ class updateLocalSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'localSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'localSubmission', (airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission, airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, jobSubmissionInterfaceId=None, localSubmission=None,):
@@ -34754,7 +35019,7 @@ class updateLocalSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34765,7 +35030,7 @@ class updateLocalSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.localSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission()
+                    self.localSubmission = airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission()
                     self.localSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34827,10 +35092,10 @@ class updateLocalSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -34856,25 +35121,25 @@ class updateLocalSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -34935,7 +35200,7 @@ class getLocalJobSubmission_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionId', 'UTF8', None, ),  # 2
     )
 
@@ -34954,7 +35219,7 @@ class getLocalJobSubmission_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35014,11 +35279,11 @@ class getLocalJobSubmission_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission, airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -35039,31 +35304,31 @@ class getLocalJobSubmission_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission()
+                    self.success = airavata.model.appcatalog.computeresource.ttypes.LOCALSubmission()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35126,10 +35391,10 @@ class addSSHJobSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'priorityOrder', None, None, ),  # 3
-        (4, TType.STRUCT, 'sshJobSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'sshJobSubmission', (airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, sshJobSubmission=None,):
@@ -35149,7 +35414,7 @@ class addSSHJobSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35165,7 +35430,7 @@ class addSSHJobSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.sshJobSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
+                    self.sshJobSubmission = airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
                     self.sshJobSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35233,10 +35498,10 @@ class addSSHJobSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -35262,25 +35527,25 @@ class addSSHJobSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35343,10 +35608,10 @@ class addSSHForkJobSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'priorityOrder', None, None, ),  # 3
-        (4, TType.STRUCT, 'sshJobSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'sshJobSubmission', (airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, sshJobSubmission=None,):
@@ -35366,7 +35631,7 @@ class addSSHForkJobSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35382,7 +35647,7 @@ class addSSHForkJobSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.sshJobSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
+                    self.sshJobSubmission = airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
                     self.sshJobSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35450,10 +35715,10 @@ class addSSHForkJobSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -35479,25 +35744,25 @@ class addSSHForkJobSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35558,7 +35823,7 @@ class getSSHJobSubmission_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionId', 'UTF8', None, ),  # 2
     )
 
@@ -35577,7 +35842,7 @@ class getSSHJobSubmission_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35637,11 +35902,11 @@ class getSSHJobSubmission_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -35662,31 +35927,31 @@ class getSSHJobSubmission_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
+                    self.success = airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35749,10 +36014,10 @@ class addUNICOREJobSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'priorityOrder', None, None, ),  # 3
-        (4, TType.STRUCT, 'unicoreJobSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'unicoreJobSubmission', (airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission, airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, unicoreJobSubmission=None,):
@@ -35772,7 +36037,7 @@ class addUNICOREJobSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35788,7 +36053,7 @@ class addUNICOREJobSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.unicoreJobSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission()
+                    self.unicoreJobSubmission = airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission()
                     self.unicoreJobSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35856,10 +36121,10 @@ class addUNICOREJobSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -35885,25 +36150,25 @@ class addUNICOREJobSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -35964,7 +36229,7 @@ class getUnicoreJobSubmission_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionId', 'UTF8', None, ),  # 2
     )
 
@@ -35983,7 +36248,7 @@ class getUnicoreJobSubmission_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36043,11 +36308,11 @@ class getUnicoreJobSubmission_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission, airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -36068,31 +36333,31 @@ class getUnicoreJobSubmission_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission()
+                    self.success = airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36155,10 +36420,10 @@ class addCloudJobSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'priorityOrder', None, None, ),  # 3
-        (4, TType.STRUCT, 'cloudSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'cloudSubmission', (airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission, airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, cloudSubmission=None,):
@@ -36178,7 +36443,7 @@ class addCloudJobSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36194,7 +36459,7 @@ class addCloudJobSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.cloudSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission()
+                    self.cloudSubmission = airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission()
                     self.cloudSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36262,10 +36527,10 @@ class addCloudJobSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -36291,25 +36556,25 @@ class addCloudJobSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36370,7 +36635,7 @@ class getCloudJobSubmission_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionId', 'UTF8', None, ),  # 2
     )
 
@@ -36389,7 +36654,7 @@ class getCloudJobSubmission_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36449,11 +36714,11 @@ class getCloudJobSubmission_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission, airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -36474,31 +36739,31 @@ class getCloudJobSubmission_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission()
+                    self.success = airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36560,9 +36825,9 @@ class updateSSHJobSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'sshJobSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'sshJobSubmission', (airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission, airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, jobSubmissionInterfaceId=None, sshJobSubmission=None,):
@@ -36581,7 +36846,7 @@ class updateSSHJobSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36592,7 +36857,7 @@ class updateSSHJobSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.sshJobSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
+                    self.sshJobSubmission = airavata.model.appcatalog.computeresource.ttypes.SSHJobSubmission()
                     self.sshJobSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36654,10 +36919,10 @@ class updateSSHJobSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -36683,25 +36948,25 @@ class updateSSHJobSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36763,9 +37028,9 @@ class updateCloudJobSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'sshJobSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'sshJobSubmission', (airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission, airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, jobSubmissionInterfaceId=None, sshJobSubmission=None,):
@@ -36784,7 +37049,7 @@ class updateCloudJobSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36795,7 +37060,7 @@ class updateCloudJobSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.sshJobSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission()
+                    self.sshJobSubmission = airavata.model.appcatalog.computeresource.ttypes.CloudJobSubmission()
                     self.sshJobSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36857,10 +37122,10 @@ class updateCloudJobSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -36886,25 +37151,25 @@ class updateCloudJobSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36966,9 +37231,9 @@ class updateUnicoreJobSubmissionDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'unicoreJobSubmission', (apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission, apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'unicoreJobSubmission', (airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission, airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, jobSubmissionInterfaceId=None, unicoreJobSubmission=None,):
@@ -36987,7 +37252,7 @@ class updateUnicoreJobSubmissionDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -36998,7 +37263,7 @@ class updateUnicoreJobSubmissionDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.unicoreJobSubmission = apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission()
+                    self.unicoreJobSubmission = airavata.model.appcatalog.computeresource.ttypes.UnicoreJobSubmission()
                     self.unicoreJobSubmission.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37060,10 +37325,10 @@ class updateUnicoreJobSubmissionDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -37089,25 +37354,25 @@ class updateUnicoreJobSubmissionDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37171,11 +37436,11 @@ class addLocalDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
         (3, TType.I32, 'dataMoveType', None, None, ),  # 3
         (4, TType.I32, 'priorityOrder', None, None, ),  # 4
-        (5, TType.STRUCT, 'localDataMovement', (apache.airavata.model.data.movement.ttypes.LOCALDataMovement, apache.airavata.model.data.movement.ttypes.LOCALDataMovement.thrift_spec), None, ),  # 5
+        (5, TType.STRUCT, 'localDataMovement', (airavata.model.data.movement.ttypes.LOCALDataMovement, airavata.model.data.movement.ttypes.LOCALDataMovement.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, authzToken=None, productUri=None, dataMoveType=None, priorityOrder=None, localDataMovement=None,):
@@ -37196,7 +37461,7 @@ class addLocalDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37217,7 +37482,7 @@ class addLocalDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.localDataMovement = apache.airavata.model.data.movement.ttypes.LOCALDataMovement()
+                    self.localDataMovement = airavata.model.data.movement.ttypes.LOCALDataMovement()
                     self.localDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37291,10 +37556,10 @@ class addLocalDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -37320,25 +37585,25 @@ class addLocalDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37400,9 +37665,9 @@ class updateLocalDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'localDataMovement', (apache.airavata.model.data.movement.ttypes.LOCALDataMovement, apache.airavata.model.data.movement.ttypes.LOCALDataMovement.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'localDataMovement', (airavata.model.data.movement.ttypes.LOCALDataMovement, airavata.model.data.movement.ttypes.LOCALDataMovement.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, dataMovementInterfaceId=None, localDataMovement=None,):
@@ -37421,7 +37686,7 @@ class updateLocalDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37432,7 +37697,7 @@ class updateLocalDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.localDataMovement = apache.airavata.model.data.movement.ttypes.LOCALDataMovement()
+                    self.localDataMovement = airavata.model.data.movement.ttypes.LOCALDataMovement()
                     self.localDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37494,10 +37759,10 @@ class updateLocalDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -37523,25 +37788,25 @@ class updateLocalDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37602,7 +37867,7 @@ class getLocalDataMovement_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementId', 'UTF8', None, ),  # 2
     )
 
@@ -37621,7 +37886,7 @@ class getLocalDataMovement_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37681,11 +37946,11 @@ class getLocalDataMovement_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.data.movement.ttypes.LOCALDataMovement, apache.airavata.model.data.movement.ttypes.LOCALDataMovement.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.data.movement.ttypes.LOCALDataMovement, airavata.model.data.movement.ttypes.LOCALDataMovement.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -37706,31 +37971,31 @@ class getLocalDataMovement_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.data.movement.ttypes.LOCALDataMovement()
+                    self.success = airavata.model.data.movement.ttypes.LOCALDataMovement()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37794,11 +38059,11 @@ class addSCPDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
         (3, TType.I32, 'dataMoveType', None, None, ),  # 3
         (4, TType.I32, 'priorityOrder', None, None, ),  # 4
-        (5, TType.STRUCT, 'scpDataMovement', (apache.airavata.model.data.movement.ttypes.SCPDataMovement, apache.airavata.model.data.movement.ttypes.SCPDataMovement.thrift_spec), None, ),  # 5
+        (5, TType.STRUCT, 'scpDataMovement', (airavata.model.data.movement.ttypes.SCPDataMovement, airavata.model.data.movement.ttypes.SCPDataMovement.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, authzToken=None, productUri=None, dataMoveType=None, priorityOrder=None, scpDataMovement=None,):
@@ -37819,7 +38084,7 @@ class addSCPDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37840,7 +38105,7 @@ class addSCPDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.scpDataMovement = apache.airavata.model.data.movement.ttypes.SCPDataMovement()
+                    self.scpDataMovement = airavata.model.data.movement.ttypes.SCPDataMovement()
                     self.scpDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -37914,10 +38179,10 @@ class addSCPDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -37943,25 +38208,25 @@ class addSCPDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38023,9 +38288,9 @@ class updateSCPDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'scpDataMovement', (apache.airavata.model.data.movement.ttypes.SCPDataMovement, apache.airavata.model.data.movement.ttypes.SCPDataMovement.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'scpDataMovement', (airavata.model.data.movement.ttypes.SCPDataMovement, airavata.model.data.movement.ttypes.SCPDataMovement.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, dataMovementInterfaceId=None, scpDataMovement=None,):
@@ -38044,7 +38309,7 @@ class updateSCPDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38055,7 +38320,7 @@ class updateSCPDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.scpDataMovement = apache.airavata.model.data.movement.ttypes.SCPDataMovement()
+                    self.scpDataMovement = airavata.model.data.movement.ttypes.SCPDataMovement()
                     self.scpDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38117,10 +38382,10 @@ class updateSCPDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -38146,25 +38411,25 @@ class updateSCPDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38225,7 +38490,7 @@ class getSCPDataMovement_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementId', 'UTF8', None, ),  # 2
     )
 
@@ -38244,7 +38509,7 @@ class getSCPDataMovement_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38304,11 +38569,11 @@ class getSCPDataMovement_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.data.movement.ttypes.SCPDataMovement, apache.airavata.model.data.movement.ttypes.SCPDataMovement.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.data.movement.ttypes.SCPDataMovement, airavata.model.data.movement.ttypes.SCPDataMovement.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -38329,31 +38594,31 @@ class getSCPDataMovement_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.data.movement.ttypes.SCPDataMovement()
+                    self.success = airavata.model.data.movement.ttypes.SCPDataMovement()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38417,11 +38682,11 @@ class addUnicoreDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
         (3, TType.I32, 'dataMoveType', None, None, ),  # 3
         (4, TType.I32, 'priorityOrder', None, None, ),  # 4
-        (5, TType.STRUCT, 'unicoreDataMovement', (apache.airavata.model.data.movement.ttypes.UnicoreDataMovement, apache.airavata.model.data.movement.ttypes.UnicoreDataMovement.thrift_spec), None, ),  # 5
+        (5, TType.STRUCT, 'unicoreDataMovement', (airavata.model.data.movement.ttypes.UnicoreDataMovement, airavata.model.data.movement.ttypes.UnicoreDataMovement.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, authzToken=None, productUri=None, dataMoveType=None, priorityOrder=None, unicoreDataMovement=None,):
@@ -38442,7 +38707,7 @@ class addUnicoreDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38463,7 +38728,7 @@ class addUnicoreDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.unicoreDataMovement = apache.airavata.model.data.movement.ttypes.UnicoreDataMovement()
+                    self.unicoreDataMovement = airavata.model.data.movement.ttypes.UnicoreDataMovement()
                     self.unicoreDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38537,10 +38802,10 @@ class addUnicoreDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -38566,25 +38831,25 @@ class addUnicoreDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38646,9 +38911,9 @@ class updateUnicoreDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'unicoreDataMovement', (apache.airavata.model.data.movement.ttypes.UnicoreDataMovement, apache.airavata.model.data.movement.ttypes.UnicoreDataMovement.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'unicoreDataMovement', (airavata.model.data.movement.ttypes.UnicoreDataMovement, airavata.model.data.movement.ttypes.UnicoreDataMovement.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, dataMovementInterfaceId=None, unicoreDataMovement=None,):
@@ -38667,7 +38932,7 @@ class updateUnicoreDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38678,7 +38943,7 @@ class updateUnicoreDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.unicoreDataMovement = apache.airavata.model.data.movement.ttypes.UnicoreDataMovement()
+                    self.unicoreDataMovement = airavata.model.data.movement.ttypes.UnicoreDataMovement()
                     self.unicoreDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38740,10 +39005,10 @@ class updateUnicoreDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -38769,25 +39034,25 @@ class updateUnicoreDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38848,7 +39113,7 @@ class getUnicoreDataMovement_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementId', 'UTF8', None, ),  # 2
     )
 
@@ -38867,7 +39132,7 @@ class getUnicoreDataMovement_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -38927,11 +39192,11 @@ class getUnicoreDataMovement_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.data.movement.ttypes.UnicoreDataMovement, apache.airavata.model.data.movement.ttypes.UnicoreDataMovement.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.data.movement.ttypes.UnicoreDataMovement, airavata.model.data.movement.ttypes.UnicoreDataMovement.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -38952,31 +39217,31 @@ class getUnicoreDataMovement_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.data.movement.ttypes.UnicoreDataMovement()
+                    self.success = airavata.model.data.movement.ttypes.UnicoreDataMovement()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39040,11 +39305,11 @@ class addGridFTPDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
         (3, TType.I32, 'dataMoveType', None, None, ),  # 3
         (4, TType.I32, 'priorityOrder', None, None, ),  # 4
-        (5, TType.STRUCT, 'gridFTPDataMovement', (apache.airavata.model.data.movement.ttypes.GridFTPDataMovement, apache.airavata.model.data.movement.ttypes.GridFTPDataMovement.thrift_spec), None, ),  # 5
+        (5, TType.STRUCT, 'gridFTPDataMovement', (airavata.model.data.movement.ttypes.GridFTPDataMovement, airavata.model.data.movement.ttypes.GridFTPDataMovement.thrift_spec), None, ),  # 5
     )
 
     def __init__(self, authzToken=None, productUri=None, dataMoveType=None, priorityOrder=None, gridFTPDataMovement=None,):
@@ -39065,7 +39330,7 @@ class addGridFTPDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39086,7 +39351,7 @@ class addGridFTPDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.gridFTPDataMovement = apache.airavata.model.data.movement.ttypes.GridFTPDataMovement()
+                    self.gridFTPDataMovement = airavata.model.data.movement.ttypes.GridFTPDataMovement()
                     self.gridFTPDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39160,10 +39425,10 @@ class addGridFTPDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -39189,25 +39454,25 @@ class addGridFTPDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39269,9 +39534,9 @@ class updateGridFTPDataMovementDetails_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementInterfaceId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'gridFTPDataMovement', (apache.airavata.model.data.movement.ttypes.GridFTPDataMovement, apache.airavata.model.data.movement.ttypes.GridFTPDataMovement.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'gridFTPDataMovement', (airavata.model.data.movement.ttypes.GridFTPDataMovement, airavata.model.data.movement.ttypes.GridFTPDataMovement.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, dataMovementInterfaceId=None, gridFTPDataMovement=None,):
@@ -39290,7 +39555,7 @@ class updateGridFTPDataMovementDetails_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39301,7 +39566,7 @@ class updateGridFTPDataMovementDetails_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.gridFTPDataMovement = apache.airavata.model.data.movement.ttypes.GridFTPDataMovement()
+                    self.gridFTPDataMovement = airavata.model.data.movement.ttypes.GridFTPDataMovement()
                     self.gridFTPDataMovement.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39363,10 +39628,10 @@ class updateGridFTPDataMovementDetails_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -39392,25 +39657,25 @@ class updateGridFTPDataMovementDetails_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39471,7 +39736,7 @@ class getGridFTPDataMovement_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementId', 'UTF8', None, ),  # 2
     )
 
@@ -39490,7 +39755,7 @@ class getGridFTPDataMovement_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39550,11 +39815,11 @@ class getGridFTPDataMovement_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.data.movement.ttypes.GridFTPDataMovement, apache.airavata.model.data.movement.ttypes.GridFTPDataMovement.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.data.movement.ttypes.GridFTPDataMovement, airavata.model.data.movement.ttypes.GridFTPDataMovement.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -39575,31 +39840,31 @@ class getGridFTPDataMovement_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.data.movement.ttypes.GridFTPDataMovement()
+                    self.success = airavata.model.data.movement.ttypes.GridFTPDataMovement()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39661,7 +39926,7 @@ class changeJobSubmissionPriority_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'jobSubmissionInterfaceId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'newPriorityOrder', None, None, ),  # 3
     )
@@ -39682,7 +39947,7 @@ class changeJobSubmissionPriority_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39754,10 +40019,10 @@ class changeJobSubmissionPriority_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -39783,25 +40048,25 @@ class changeJobSubmissionPriority_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39863,7 +40128,7 @@ class changeDataMovementPriority_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'dataMovementInterfaceId', 'UTF8', None, ),  # 2
         (3, TType.I32, 'newPriorityOrder', None, None, ),  # 3
     )
@@ -39884,7 +40149,7 @@ class changeDataMovementPriority_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -39956,10 +40221,10 @@ class changeDataMovementPriority_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -39985,25 +40250,25 @@ class changeDataMovementPriority_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40064,7 +40329,7 @@ class changeJobSubmissionPriorities_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.MAP, 'jobSubmissionPriorityMap', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 2
     )
 
@@ -40083,7 +40348,7 @@ class changeJobSubmissionPriorities_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40154,10 +40419,10 @@ class changeJobSubmissionPriorities_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -40183,25 +40448,25 @@ class changeJobSubmissionPriorities_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40262,7 +40527,7 @@ class changeDataMovementPriorities_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.MAP, 'dataMovementPriorityMap', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 2
     )
 
@@ -40281,7 +40546,7 @@ class changeDataMovementPriorities_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40352,10 +40617,10 @@ class changeDataMovementPriorities_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -40381,25 +40646,25 @@ class changeDataMovementPriorities_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40461,7 +40726,7 @@ class deleteJobSubmissionInterface_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'jobSubmissionInterfaceId', 'UTF8', None, ),  # 3
     )
@@ -40482,7 +40747,7 @@ class deleteJobSubmissionInterface_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40554,10 +40819,10 @@ class deleteJobSubmissionInterface_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -40583,25 +40848,25 @@ class deleteJobSubmissionInterface_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40664,7 +40929,7 @@ class deleteDataMovementInterface_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'dataMovementInterfaceId', 'UTF8', None, ),  # 3
         (4, TType.I32, 'dataMoveType', None, None, ),  # 4
@@ -40687,7 +40952,7 @@ class deleteDataMovementInterface_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40770,10 +41035,10 @@ class deleteDataMovementInterface_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -40799,25 +41064,25 @@ class deleteDataMovementInterface_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40878,8 +41143,8 @@ class registerResourceJobManager_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'resourceJobManager', (apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager, apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'resourceJobManager', (airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager, airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, resourceJobManager=None,):
@@ -40897,13 +41162,13 @@ class registerResourceJobManager_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.resourceJobManager = apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager()
+                    self.resourceJobManager = airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager()
                     self.resourceJobManager.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -40959,10 +41224,10 @@ class registerResourceJobManager_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -40988,25 +41253,25 @@ class registerResourceJobManager_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41068,9 +41333,9 @@ class updateResourceJobManager_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceJobManagerId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'updatedResourceJobManager', (apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager, apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'updatedResourceJobManager', (airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager, airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, resourceJobManagerId=None, updatedResourceJobManager=None,):
@@ -41089,7 +41354,7 @@ class updateResourceJobManager_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41100,7 +41365,7 @@ class updateResourceJobManager_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.updatedResourceJobManager = apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager()
+                    self.updatedResourceJobManager = airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager()
                     self.updatedResourceJobManager.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41162,10 +41427,10 @@ class updateResourceJobManager_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -41191,25 +41456,25 @@ class updateResourceJobManager_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41270,7 +41535,7 @@ class getResourceJobManager_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceJobManagerId', 'UTF8', None, ),  # 2
     )
 
@@ -41289,7 +41554,7 @@ class getResourceJobManager_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41349,11 +41614,11 @@ class getResourceJobManager_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager, apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager, airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -41374,31 +41639,31 @@ class getResourceJobManager_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager()
+                    self.success = airavata.model.appcatalog.computeresource.ttypes.ResourceJobManager()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41459,7 +41724,7 @@ class deleteResourceJobManager_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceJobManagerId', 'UTF8', None, ),  # 2
     )
 
@@ -41478,7 +41743,7 @@ class deleteResourceJobManager_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41539,10 +41804,10 @@ class deleteResourceJobManager_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -41568,25 +41833,25 @@ class deleteResourceJobManager_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41648,7 +41913,7 @@ class deleteBatchQueue_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'queueName', 'UTF8', None, ),  # 3
     )
@@ -41669,7 +41934,7 @@ class deleteBatchQueue_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41741,10 +42006,10 @@ class deleteBatchQueue_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -41770,25 +42035,25 @@ class deleteBatchQueue_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41849,8 +42114,8 @@ class registerGatewayResourceProfile_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'gatewayResourceProfile', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'gatewayResourceProfile', (airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, gatewayResourceProfile=None,):
@@ -41868,13 +42133,13 @@ class registerGatewayResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.gatewayResourceProfile = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+                    self.gatewayResourceProfile = airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
                     self.gatewayResourceProfile.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -41930,10 +42195,10 @@ class registerGatewayResourceProfile_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -41959,25 +42224,25 @@ class registerGatewayResourceProfile_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42038,7 +42303,7 @@ class getGatewayResourceProfile_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
     )
 
@@ -42057,7 +42322,7 @@ class getGatewayResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42117,11 +42382,11 @@ class getGatewayResourceProfile_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -42142,31 +42407,31 @@ class getGatewayResourceProfile_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+                    self.success = airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42228,9 +42493,9 @@ class updateGatewayResourceProfile_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'gatewayResourceProfile', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), None, ),  # 3
+        (3, TType.STRUCT, 'gatewayResourceProfile', (airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), None, ),  # 3
     )
 
     def __init__(self, authzToken=None, gatewayID=None, gatewayResourceProfile=None,):
@@ -42249,7 +42514,7 @@ class updateGatewayResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42260,7 +42525,7 @@ class updateGatewayResourceProfile_args(object):
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.gatewayResourceProfile = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+                    self.gatewayResourceProfile = airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
                     self.gatewayResourceProfile.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42322,10 +42587,10 @@ class updateGatewayResourceProfile_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -42351,25 +42616,25 @@ class updateGatewayResourceProfile_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42430,7 +42695,7 @@ class deleteGatewayResourceProfile_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
     )
 
@@ -42449,7 +42714,7 @@ class deleteGatewayResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42510,10 +42775,10 @@ class deleteGatewayResourceProfile_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -42539,25 +42804,25 @@ class deleteGatewayResourceProfile_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42620,10 +42885,10 @@ class addGatewayComputeResourcePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 3
-        (4, TType.STRUCT, 'computeResourcePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'computeResourcePreference', (airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, gatewayID=None, computeResourceId=None, computeResourcePreference=None,):
@@ -42643,7 +42908,7 @@ class addGatewayComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42659,7 +42924,7 @@ class addGatewayComputeResourcePreference_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.computeResourcePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+                    self.computeResourcePreference = airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
                     self.computeResourcePreference.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42727,10 +42992,10 @@ class addGatewayComputeResourcePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -42756,25 +43021,25 @@ class addGatewayComputeResourcePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42837,10 +43102,10 @@ class addGatewayStoragePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'storageResourceId', 'UTF8', None, ),  # 3
-        (4, TType.STRUCT, 'storagePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'storagePreference', (airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, gatewayID=None, storageResourceId=None, storagePreference=None,):
@@ -42860,7 +43125,7 @@ class addGatewayStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42876,7 +43141,7 @@ class addGatewayStoragePreference_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.storagePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+                    self.storagePreference = airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
                     self.storagePreference.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -42944,10 +43209,10 @@ class addGatewayStoragePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -42973,25 +43238,25 @@ class addGatewayStoragePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43053,7 +43318,7 @@ class getGatewayComputeResourcePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 3
     )
@@ -43074,7 +43339,7 @@ class getGatewayComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43145,11 +43410,11 @@ class getGatewayComputeResourcePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -43170,31 +43435,31 @@ class getGatewayComputeResourcePreference_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+                    self.success = airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43256,7 +43521,7 @@ class getGatewayStoragePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'storageResourceId', 'UTF8', None, ),  # 3
     )
@@ -43277,7 +43542,7 @@ class getGatewayStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43348,11 +43613,11 @@ class getGatewayStoragePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -43373,31 +43638,31 @@ class getGatewayStoragePreference_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+                    self.success = airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43458,7 +43723,7 @@ class getAllGatewayComputeResourcePreferences_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
     )
 
@@ -43477,7 +43742,7 @@ class getAllGatewayComputeResourcePreferences_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43537,11 +43802,11 @@ class getAllGatewayComputeResourcePreferences_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -43565,7 +43830,7 @@ class getAllGatewayComputeResourcePreferences_result(object):
                     self.success = []
                     (_etype235, _size232) = iprot.readListBegin()
                     for _i236 in range(_size232):
-                        _elem237 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+                        _elem237 = airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
                         _elem237.read(iprot)
                         self.success.append(_elem237)
                     iprot.readListEnd()
@@ -43573,25 +43838,25 @@ class getAllGatewayComputeResourcePreferences_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43655,7 +43920,7 @@ class getAllGatewayStoragePreferences_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
     )
 
@@ -43674,7 +43939,7 @@ class getAllGatewayStoragePreferences_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43734,11 +43999,11 @@ class getAllGatewayStoragePreferences_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -43762,7 +44027,7 @@ class getAllGatewayStoragePreferences_result(object):
                     self.success = []
                     (_etype242, _size239) = iprot.readListBegin()
                     for _i243 in range(_size239):
-                        _elem244 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+                        _elem244 = airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
                         _elem244.read(iprot)
                         self.success.append(_elem244)
                     iprot.readListEnd()
@@ -43770,25 +44035,25 @@ class getAllGatewayStoragePreferences_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43851,7 +44116,7 @@ class getAllGatewayResourceProfiles_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, authzToken=None,):
@@ -43868,7 +44133,7 @@ class getAllGatewayResourceProfiles_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -43917,11 +44182,11 @@ class getAllGatewayResourceProfiles_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile, airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -43945,7 +44210,7 @@ class getAllGatewayResourceProfiles_result(object):
                     self.success = []
                     (_etype249, _size246) = iprot.readListBegin()
                     for _i250 in range(_size246):
-                        _elem251 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
+                        _elem251 = airavata.model.appcatalog.gatewayprofile.ttypes.GatewayResourceProfile()
                         _elem251.read(iprot)
                         self.success.append(_elem251)
                     iprot.readListEnd()
@@ -43953,25 +44218,25 @@ class getAllGatewayResourceProfiles_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44037,10 +44302,10 @@ class updateGatewayComputeResourcePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 3
-        (4, TType.STRUCT, 'computeResourcePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'computeResourcePreference', (airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference, airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, gatewayID=None, computeResourceId=None, computeResourcePreference=None,):
@@ -44060,7 +44325,7 @@ class updateGatewayComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44076,7 +44341,7 @@ class updateGatewayComputeResourcePreference_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.computeResourcePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
+                    self.computeResourcePreference = airavata.model.appcatalog.gatewayprofile.ttypes.ComputeResourcePreference()
                     self.computeResourcePreference.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44144,10 +44409,10 @@ class updateGatewayComputeResourcePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -44173,25 +44438,25 @@ class updateGatewayComputeResourcePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44254,10 +44519,10 @@ class updateGatewayStoragePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'storageId', 'UTF8', None, ),  # 3
-        (4, TType.STRUCT, 'storagePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'storagePreference', (airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, authzToken=None, gatewayID=None, storageId=None, storagePreference=None,):
@@ -44277,7 +44542,7 @@ class updateGatewayStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44293,7 +44558,7 @@ class updateGatewayStoragePreference_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.storagePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+                    self.storagePreference = airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
                     self.storagePreference.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44361,10 +44626,10 @@ class updateGatewayStoragePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -44390,25 +44655,25 @@ class updateGatewayStoragePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44470,7 +44735,7 @@ class deleteGatewayComputeResourcePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 3
     )
@@ -44491,7 +44756,7 @@ class deleteGatewayComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44563,10 +44828,10 @@ class deleteGatewayComputeResourcePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -44592,25 +44857,25 @@ class deleteGatewayComputeResourcePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44672,7 +44937,7 @@ class deleteGatewayStoragePreference_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'storageId', 'UTF8', None, ),  # 3
     )
@@ -44693,7 +44958,7 @@ class deleteGatewayStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44765,10 +45030,10 @@ class deleteGatewayStoragePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -44794,25 +45059,25 @@ class deleteGatewayStoragePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -44864,22 +45129,19 @@ class deleteGatewayStoragePreference_result(object):
         return not (self == other)
 
 
-class registerUserResourceProfile_args(object):
+class getSSHAccountProvisioners_args(object):
     """
     Attributes:
      - authzToken
-     - userResourceProfile
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'userResourceProfile', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
-    def __init__(self, authzToken=None, userResourceProfile=None,):
+    def __init__(self, authzToken=None,):
         self.authzToken = authzToken
-        self.userResourceProfile = userResourceProfile
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -44892,16 +45154,10 @@ class registerUserResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
-            elif fid == 2:
-                if ftype == TType.STRUCT:
-                    self.userResourceProfile = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
-                    self.userResourceProfile.read(iprot)
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -44911,23 +45167,17 @@ class registerUserResourceProfile_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerUserResourceProfile_args')
+        oprot.writeStructBegin('getSSHAccountProvisioners_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.userResourceProfile is not None:
-            oprot.writeFieldBegin('userResourceProfile', TType.STRUCT, 2)
-            self.userResourceProfile.write(oprot)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.userResourceProfile is None:
-            raise TProtocolException(message='Required field userResourceProfile is unset!')
         return
 
     def __repr__(self):
@@ -44942,7 +45192,7 @@ class registerUserResourceProfile_args(object):
         return not (self == other)
 
 
-class registerUserResourceProfile_result(object):
+class getSSHAccountProvisioners_result(object):
     """
     Attributes:
      - success
@@ -44953,11 +45203,11 @@ class registerUserResourceProfile_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.accountprovisioning.ttypes.SSHAccountProvisioner, airavata.model.appcatalog.accountprovisioning.ttypes.SSHAccountProvisioner.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -44977,31 +45227,37 @@ class registerUserResourceProfile_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRING:
-                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype256, _size253) = iprot.readListBegin()
+                    for _i257 in range(_size253):
+                        _elem258 = airavata.model.appcatalog.accountprovisioning.ttypes.SSHAccountProvisioner()
+                        _elem258.read(iprot)
+                        self.success.append(_elem258)
+                    iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -45014,10 +45270,13 @@ class registerUserResourceProfile_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerUserResourceProfile_result')
+        oprot.writeStructBegin('getSSHAccountProvisioners_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRING, 0)
-            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRUCT, len(self.success))
+            for iter259 in self.success:
+                iter259.write(oprot)
+            oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -45053,25 +45312,25 @@ class registerUserResourceProfile_result(object):
         return not (self == other)
 
 
-class getUserResourceProfile_args(object):
+class doesUserHaveSSHAccount_args(object):
     """
     Attributes:
      - authzToken
+     - computeResourceId
      - userId
-     - gatewayID
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
+        (3, TType.STRING, 'userId', 'UTF8', None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
+    def __init__(self, authzToken=None, computeResourceId=None, userId=None,):
         self.authzToken = authzToken
+        self.computeResourceId = computeResourceId
         self.userId = userId
-        self.gatewayID = gatewayID
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -45084,18 +45343,18 @@ class getUserResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.computeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRING:
-                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -45107,29 +45366,29 @@ class getUserResourceProfile_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getUserResourceProfile_args')
+        oprot.writeStructBegin('doesUserHaveSSHAccount_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
+        if self.computeResourceId is not None:
+            oprot.writeFieldBegin('computeResourceId', TType.STRING, 2)
+            oprot.writeString(self.computeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.computeResourceId)
+            oprot.writeFieldEnd()
         if self.userId is not None:
-            oprot.writeFieldBegin('userId', TType.STRING, 2)
+            oprot.writeFieldBegin('userId', TType.STRING, 3)
             oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
             oprot.writeFieldEnd()
-        if self.gatewayID is not None:
-            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
-            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
+        if self.computeResourceId is None:
+            raise TProtocolException(message='Required field computeResourceId is unset!')
         if self.userId is None:
             raise TProtocolException(message='Required field userId is unset!')
-        if self.gatewayID is None:
-            raise TProtocolException(message='Required field gatewayID is unset!')
         return
 
     def __repr__(self):
@@ -45144,7 +45403,7 @@ class getUserResourceProfile_args(object):
         return not (self == other)
 
 
-class getUserResourceProfile_result(object):
+class doesUserHaveSSHAccount_result(object):
     """
     Attributes:
      - success
@@ -45155,11 +45414,11 @@ class getUserResourceProfile_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -45179,32 +45438,31 @@ class getUserResourceProfile_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
-                    self.success.read(iprot)
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -45217,10 +45475,10 @@ class getUserResourceProfile_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getUserResourceProfile_result')
+        oprot.writeStructBegin('doesUserHaveSSHAccount_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRUCT, 0)
-            self.success.write(oprot)
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -45256,28 +45514,28 @@ class getUserResourceProfile_result(object):
         return not (self == other)
 
 
-class updateUserResourceProfile_args(object):
+class setupUserComputeResourcePreferencesForSSH_args(object):
     """
     Attributes:
      - authzToken
+     - computeResourceId
      - userId
-     - gatewayID
-     - userResourceProfile
+     - airavataCredStoreToken
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRUCT, 'userResourceProfile', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 2
+        (3, TType.STRING, 'userId', 'UTF8', None, ),  # 3
+        (4, TType.STRING, 'airavataCredStoreToken', 'UTF8', None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userResourceProfile=None,):
+    def __init__(self, authzToken=None, computeResourceId=None, userId=None, airavataCredStoreToken=None,):
         self.authzToken = authzToken
+        self.computeResourceId = computeResourceId
         self.userId = userId
-        self.gatewayID = gatewayID
-        self.userResourceProfile = userResourceProfile
+        self.airavataCredStoreToken = airavataCredStoreToken
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -45290,24 +45548,23 @@ class updateUserResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.computeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRING:
-                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
-                if ftype == TType.STRUCT:
-                    self.userResourceProfile = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
-                    self.userResourceProfile.read(iprot)
+                if ftype == TType.STRING:
+                    self.airavataCredStoreToken = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -45319,22 +45576,22 @@ class updateUserResourceProfile_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateUserResourceProfile_args')
+        oprot.writeStructBegin('setupUserComputeResourcePreferencesForSSH_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
+        if self.computeResourceId is not None:
+            oprot.writeFieldBegin('computeResourceId', TType.STRING, 2)
+            oprot.writeString(self.computeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.computeResourceId)
+            oprot.writeFieldEnd()
         if self.userId is not None:
-            oprot.writeFieldBegin('userId', TType.STRING, 2)
+            oprot.writeFieldBegin('userId', TType.STRING, 3)
             oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
             oprot.writeFieldEnd()
-        if self.gatewayID is not None:
-            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
-            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
-            oprot.writeFieldEnd()
-        if self.userResourceProfile is not None:
-            oprot.writeFieldBegin('userResourceProfile', TType.STRUCT, 4)
-            self.userResourceProfile.write(oprot)
+        if self.airavataCredStoreToken is not None:
+            oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 4)
+            oprot.writeString(self.airavataCredStoreToken.encode('utf-8') if sys.version_info[0] == 2 else self.airavataCredStoreToken)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -45342,12 +45599,12 @@ class updateUserResourceProfile_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
+        if self.computeResourceId is None:
+            raise TProtocolException(message='Required field computeResourceId is unset!')
         if self.userId is None:
             raise TProtocolException(message='Required field userId is unset!')
-        if self.gatewayID is None:
-            raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userResourceProfile is None:
-            raise TProtocolException(message='Required field userResourceProfile is unset!')
+        if self.airavataCredStoreToken is None:
+            raise TProtocolException(message='Required field airavataCredStoreToken is unset!')
         return
 
     def __repr__(self):
@@ -45362,7 +45619,7 @@ class updateUserResourceProfile_args(object):
         return not (self == other)
 
 
-class updateUserResourceProfile_result(object):
+class setupUserComputeResourcePreferencesForSSH_result(object):
     """
     Attributes:
      - success
@@ -45373,11 +45630,11 @@ class updateUserResourceProfile_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -45397,31 +45654,32 @@ class updateUserResourceProfile_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.STRUCT:
+                    self.success = airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
+                    self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -45434,10 +45692,10 @@ class updateUserResourceProfile_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateUserResourceProfile_result')
+        oprot.writeStructBegin('setupUserComputeResourcePreferencesForSSH_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -45473,25 +45731,22 @@ class updateUserResourceProfile_result(object):
         return not (self == other)
 
 
-class deleteUserResourceProfile_args(object):
+class registerUserResourceProfile_args(object):
     """
     Attributes:
      - authzToken
-     - userId
-     - gatewayID
+     - userResourceProfile
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'userResourceProfile', (airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
+    def __init__(self, authzToken=None, userResourceProfile=None,):
         self.authzToken = authzToken
-        self.userId = userId
-        self.gatewayID = gatewayID
+        self.userResourceProfile = userResourceProfile
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -45504,18 +45759,14 @@ class deleteUserResourceProfile_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
-                if ftype == TType.STRING:
-                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRING:
-                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                if ftype == TType.STRUCT:
+                    self.userResourceProfile = airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
+                    self.userResourceProfile.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -45527,18 +45778,14 @@ class deleteUserResourceProfile_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteUserResourceProfile_args')
+        oprot.writeStructBegin('registerUserResourceProfile_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.userId is not None:
-            oprot.writeFieldBegin('userId', TType.STRING, 2)
-            oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
-            oprot.writeFieldEnd()
-        if self.gatewayID is not None:
-            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
-            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
+        if self.userResourceProfile is not None:
+            oprot.writeFieldBegin('userResourceProfile', TType.STRUCT, 2)
+            self.userResourceProfile.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -45546,10 +45793,8 @@ class deleteUserResourceProfile_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.userId is None:
-            raise TProtocolException(message='Required field userId is unset!')
-        if self.gatewayID is None:
-            raise TProtocolException(message='Required field gatewayID is unset!')
+        if self.userResourceProfile is None:
+            raise TProtocolException(message='Required field userResourceProfile is unset!')
         return
 
     def __repr__(self):
@@ -45564,7 +45809,7 @@ class deleteUserResourceProfile_args(object):
         return not (self == other)
 
 
-class deleteUserResourceProfile_result(object):
+class registerUserResourceProfile_result(object):
     """
     Attributes:
      - success
@@ -45575,11 +45820,11 @@ class deleteUserResourceProfile_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -45599,31 +45844,31 @@ class deleteUserResourceProfile_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -45636,10 +45881,10 @@ class deleteUserResourceProfile_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteUserResourceProfile_result')
+        oprot.writeStructBegin('registerUserResourceProfile_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -45675,31 +45920,25 @@ class deleteUserResourceProfile_result(object):
         return not (self == other)
 
 
-class addUserComputeResourcePreference_args(object):
+class getUserResourceProfile_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
-     - userComputeResourceId
-     - userComputeResourcePreference
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
-        (5, TType.STRUCT, 'userComputeResourcePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ),  # 5
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None, userComputeResourcePreference=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
-        self.userComputeResourceId = userComputeResourceId
-        self.userComputeResourcePreference = userComputeResourcePreference
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -45712,7 +45951,7 @@ class addUserComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -45726,17 +45965,6 @@ class addUserComputeResourcePreference_args(object):
                     self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.STRING:
-                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 5:
-                if ftype == TType.STRUCT:
-                    self.userComputeResourcePreference = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
-                    self.userComputeResourcePreference.read(iprot)
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -45746,7 +45974,7 @@ class addUserComputeResourcePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('addUserComputeResourcePreference_args')
+        oprot.writeStructBegin('getUserResourceProfile_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -45759,14 +45987,6 @@ class addUserComputeResourcePreference_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
-        if self.userComputeResourceId is not None:
-            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
-            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
-            oprot.writeFieldEnd()
-        if self.userComputeResourcePreference is not None:
-            oprot.writeFieldBegin('userComputeResourcePreference', TType.STRUCT, 5)
-            self.userComputeResourcePreference.write(oprot)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -45777,10 +45997,6 @@ class addUserComputeResourcePreference_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userComputeResourceId is None:
-            raise TProtocolException(message='Required field userComputeResourceId is unset!')
-        if self.userComputeResourcePreference is None:
-            raise TProtocolException(message='Required field userComputeResourcePreference is unset!')
         return
 
     def __repr__(self):
@@ -45795,7 +46011,7 @@ class addUserComputeResourcePreference_args(object):
         return not (self == other)
 
 
-class addUserComputeResourcePreference_result(object):
+class getUserResourceProfile_result(object):
     """
     Attributes:
      - success
@@ -45806,11 +46022,11 @@ class addUserComputeResourcePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -45830,31 +46046,32 @@ class addUserComputeResourcePreference_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.STRUCT:
+                    self.success = airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
+                    self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -45867,10 +46084,10 @@ class addUserComputeResourcePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('addUserComputeResourcePreference_result')
+        oprot.writeStructBegin('getUserResourceProfile_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -45906,31 +46123,28 @@ class addUserComputeResourcePreference_result(object):
         return not (self == other)
 
 
-class addUserStoragePreference_args(object):
+class updateUserResourceProfile_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
-     - userStorageResourceId
-     - userStoragePreference
+     - userResourceProfile
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userStorageResourceId', 'UTF8', None, ),  # 4
-        (5, TType.STRUCT, 'userStoragePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), None, ),  # 5
+        (4, TType.STRUCT, 'userResourceProfile', (airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageResourceId=None, userStoragePreference=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userResourceProfile=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
-        self.userStorageResourceId = userStorageResourceId
-        self.userStoragePreference = userStoragePreference
+        self.userResourceProfile = userResourceProfile
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -45943,7 +46157,7 @@ class addUserStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -45958,14 +46172,9 @@ class addUserStoragePreference_args(object):
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
-                if ftype == TType.STRING:
-                    self.userStorageResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 5:
                 if ftype == TType.STRUCT:
-                    self.userStoragePreference = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
-                    self.userStoragePreference.read(iprot)
+                    self.userResourceProfile = airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
+                    self.userResourceProfile.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -45977,7 +46186,7 @@ class addUserStoragePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('addUserStoragePreference_args')
+        oprot.writeStructBegin('updateUserResourceProfile_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -45990,13 +46199,9 @@ class addUserStoragePreference_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
-        if self.userStorageResourceId is not None:
-            oprot.writeFieldBegin('userStorageResourceId', TType.STRING, 4)
-            oprot.writeString(self.userStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageResourceId)
-            oprot.writeFieldEnd()
-        if self.userStoragePreference is not None:
-            oprot.writeFieldBegin('userStoragePreference', TType.STRUCT, 5)
-            self.userStoragePreference.write(oprot)
+        if self.userResourceProfile is not None:
+            oprot.writeFieldBegin('userResourceProfile', TType.STRUCT, 4)
+            self.userResourceProfile.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -46008,10 +46213,8 @@ class addUserStoragePreference_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userStorageResourceId is None:
-            raise TProtocolException(message='Required field userStorageResourceId is unset!')
-        if self.userStoragePreference is None:
-            raise TProtocolException(message='Required field userStoragePreference is unset!')
+        if self.userResourceProfile is None:
+            raise TProtocolException(message='Required field userResourceProfile is unset!')
         return
 
     def __repr__(self):
@@ -46026,7 +46229,7 @@ class addUserStoragePreference_args(object):
         return not (self == other)
 
 
-class addUserStoragePreference_result(object):
+class updateUserResourceProfile_result(object):
     """
     Attributes:
      - success
@@ -46038,10 +46241,10 @@ class addUserStoragePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -46067,25 +46270,25 @@ class addUserStoragePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46098,7 +46301,7 @@ class addUserStoragePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('addUserStoragePreference_result')
+        oprot.writeStructBegin('updateUserResourceProfile_result')
         if self.success is not None:
             oprot.writeFieldBegin('success', TType.BOOL, 0)
             oprot.writeBool(self.success)
@@ -46137,28 +46340,25 @@ class addUserStoragePreference_result(object):
         return not (self == other)
 
 
-class getUserComputeResourcePreference_args(object):
+class deleteUserResourceProfile_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
-     - userComputeResourceId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
-        self.userComputeResourceId = userComputeResourceId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -46171,7 +46371,7 @@ class getUserComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46185,11 +46385,6 @@ class getUserComputeResourcePreference_args(object):
                     self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.STRING:
-                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -46199,7 +46394,7 @@ class getUserComputeResourcePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getUserComputeResourcePreference_args')
+        oprot.writeStructBegin('deleteUserResourceProfile_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -46212,10 +46407,6 @@ class getUserComputeResourcePreference_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
-        if self.userComputeResourceId is not None:
-            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
-            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -46226,8 +46417,6 @@ class getUserComputeResourcePreference_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userComputeResourceId is None:
-            raise TProtocolException(message='Required field userComputeResourceId is unset!')
         return
 
     def __repr__(self):
@@ -46242,7 +46431,7 @@ class getUserComputeResourcePreference_args(object):
         return not (self == other)
 
 
-class getUserComputeResourcePreference_result(object):
+class deleteUserResourceProfile_result(object):
     """
     Attributes:
      - success
@@ -46253,11 +46442,11 @@ class getUserComputeResourcePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -46277,32 +46466,31 @@ class getUserComputeResourcePreference_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
-                    self.success.read(iprot)
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46315,10 +46503,10 @@ class getUserComputeResourcePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getUserComputeResourcePreference_result')
+        oprot.writeStructBegin('deleteUserResourceProfile_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRUCT, 0)
-            self.success.write(oprot)
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -46354,28 +46542,31 @@ class getUserComputeResourcePreference_result(object):
         return not (self == other)
 
 
-class getUserStoragePreference_args(object):
+class addUserComputeResourcePreference_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
-     - userStorageResourceId
+     - userComputeResourceId
+     - userComputeResourcePreference
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userStorageResourceId', 'UTF8', None, ),  # 4
+        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
+        (5, TType.STRUCT, 'userComputeResourcePreference', (airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ),  # 5
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageResourceId=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None, userComputeResourcePreference=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
-        self.userStorageResourceId = userStorageResourceId
+        self.userComputeResourceId = userComputeResourceId
+        self.userComputeResourcePreference = userComputeResourcePreference
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -46388,7 +46579,7 @@ class getUserStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46404,7 +46595,13 @@ class getUserStoragePreference_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRING:
-                    self.userStorageResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 5:
+                if ftype == TType.STRUCT:
+                    self.userComputeResourcePreference = airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
+                    self.userComputeResourcePreference.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -46416,7 +46613,7 @@ class getUserStoragePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getUserStoragePreference_args')
+        oprot.writeStructBegin('addUserComputeResourcePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -46429,9 +46626,13 @@ class getUserStoragePreference_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
-        if self.userStorageResourceId is not None:
-            oprot.writeFieldBegin('userStorageResourceId', TType.STRING, 4)
-            oprot.writeString(self.userStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageResourceId)
+        if self.userComputeResourceId is not None:
+            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
+            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
+            oprot.writeFieldEnd()
+        if self.userComputeResourcePreference is not None:
+            oprot.writeFieldBegin('userComputeResourcePreference', TType.STRUCT, 5)
+            self.userComputeResourcePreference.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -46443,8 +46644,10 @@ class getUserStoragePreference_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userStorageResourceId is None:
-            raise TProtocolException(message='Required field userStorageResourceId is unset!')
+        if self.userComputeResourceId is None:
+            raise TProtocolException(message='Required field userComputeResourceId is unset!')
+        if self.userComputeResourcePreference is None:
+            raise TProtocolException(message='Required field userComputeResourcePreference is unset!')
         return
 
     def __repr__(self):
@@ -46459,7 +46662,7 @@ class getUserStoragePreference_args(object):
         return not (self == other)
 
 
-class getUserStoragePreference_result(object):
+class addUserComputeResourcePreference_result(object):
     """
     Attributes:
      - success
@@ -46470,11 +46673,11 @@ class getUserStoragePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -46494,32 +46697,31 @@ class getUserStoragePreference_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
-                    self.success.read(iprot)
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46532,10 +46734,10 @@ class getUserStoragePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getUserStoragePreference_result')
+        oprot.writeStructBegin('addUserComputeResourcePreference_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRUCT, 0)
-            self.success.write(oprot)
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -46571,25 +46773,31 @@ class getUserStoragePreference_result(object):
         return not (self == other)
 
 
-class getAllUserComputeResourcePreferences_args(object):
+class addUserStoragePreference_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
+     - userStorageResourceId
+     - userStoragePreference
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (4, TType.STRING, 'userStorageResourceId', 'UTF8', None, ),  # 4
+        (5, TType.STRUCT, 'userStoragePreference', (airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), None, ),  # 5
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageResourceId=None, userStoragePreference=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
+        self.userStorageResourceId = userStorageResourceId
+        self.userStoragePreference = userStoragePreference
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -46602,7 +46810,7 @@ class getAllUserComputeResourcePreferences_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46616,6 +46824,17 @@ class getAllUserComputeResourcePreferences_args(object):
                     self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.userStorageResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 5:
+                if ftype == TType.STRUCT:
+                    self.userStoragePreference = airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
+                    self.userStoragePreference.read(iprot)
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -46625,7 +46844,7 @@ class getAllUserComputeResourcePreferences_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllUserComputeResourcePreferences_args')
+        oprot.writeStructBegin('addUserStoragePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -46638,6 +46857,14 @@ class getAllUserComputeResourcePreferences_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
+        if self.userStorageResourceId is not None:
+            oprot.writeFieldBegin('userStorageResourceId', TType.STRING, 4)
+            oprot.writeString(self.userStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageResourceId)
+            oprot.writeFieldEnd()
+        if self.userStoragePreference is not None:
+            oprot.writeFieldBegin('userStoragePreference', TType.STRUCT, 5)
+            self.userStoragePreference.write(oprot)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -46648,6 +46875,10 @@ class getAllUserComputeResourcePreferences_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
+        if self.userStorageResourceId is None:
+            raise TProtocolException(message='Required field userStorageResourceId is unset!')
+        if self.userStoragePreference is None:
+            raise TProtocolException(message='Required field userStoragePreference is unset!')
         return
 
     def __repr__(self):
@@ -46662,7 +46893,7 @@ class getAllUserComputeResourcePreferences_args(object):
         return not (self == other)
 
 
-class getAllUserComputeResourcePreferences_result(object):
+class addUserStoragePreference_result(object):
     """
     Attributes:
      - success
@@ -46673,11 +46904,11 @@ class getAllUserComputeResourcePreferences_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -46697,37 +46928,31 @@ class getAllUserComputeResourcePreferences_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.LIST:
-                    self.success = []
-                    (_etype256, _size253) = iprot.readListBegin()
-                    for _i257 in range(_size253):
-                        _elem258 = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
-                        _elem258.read(iprot)
-                        self.success.append(_elem258)
-                    iprot.readListEnd()
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46740,13 +46965,10 @@ class getAllUserComputeResourcePreferences_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllUserComputeResourcePreferences_result')
+        oprot.writeStructBegin('addUserStoragePreference_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.LIST, 0)
-            oprot.writeListBegin(TType.STRUCT, len(self.success))
-            for iter259 in self.success:
-                iter259.write(oprot)
-            oprot.writeListEnd()
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -46782,25 +47004,28 @@ class getAllUserComputeResourcePreferences_result(object):
         return not (self == other)
 
 
-class getAllUserStoragePreferences_args(object):
+class getUserComputeResourcePreference_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
+     - userComputeResourceId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
+        self.userComputeResourceId = userComputeResourceId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -46813,7 +47038,7 @@ class getAllUserStoragePreferences_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46827,6 +47052,11 @@ class getAllUserStoragePreferences_args(object):
                     self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -46836,7 +47066,7 @@ class getAllUserStoragePreferences_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllUserStoragePreferences_args')
+        oprot.writeStructBegin('getUserComputeResourcePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -46849,6 +47079,10 @@ class getAllUserStoragePreferences_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
+        if self.userComputeResourceId is not None:
+            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
+            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -46859,6 +47093,8 @@ class getAllUserStoragePreferences_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
+        if self.userComputeResourceId is None:
+            raise TProtocolException(message='Required field userComputeResourceId is unset!')
         return
 
     def __repr__(self):
@@ -46873,7 +47109,7 @@ class getAllUserStoragePreferences_args(object):
         return not (self == other)
 
 
-class getAllUserStoragePreferences_result(object):
+class getUserComputeResourcePreference_result(object):
     """
     Attributes:
      - success
@@ -46884,11 +47120,11 @@ class getAllUserStoragePreferences_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -46908,37 +47144,32 @@ class getAllUserStoragePreferences_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.LIST:
-                    self.success = []
-                    (_etype263, _size260) = iprot.readListBegin()
-                    for _i264 in range(_size260):
-                        _elem265 = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
-                        _elem265.read(iprot)
-                        self.success.append(_elem265)
-                    iprot.readListEnd()
+                if ftype == TType.STRUCT:
+                    self.success = airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
+                    self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -46951,13 +47182,10 @@ class getAllUserStoragePreferences_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllUserStoragePreferences_result')
+        oprot.writeStructBegin('getUserComputeResourcePreference_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.LIST, 0)
-            oprot.writeListBegin(TType.STRUCT, len(self.success))
-            for iter266 in self.success:
-                iter266.write(oprot)
-            oprot.writeListEnd()
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -46993,19 +47221,28 @@ class getAllUserStoragePreferences_result(object):
         return not (self == other)
 
 
-class getAllUserResourceProfiles_args(object):
+class getUserStoragePreference_args(object):
     """
     Attributes:
      - authzToken
+     - userId
+     - gatewayID
+     - userStorageResourceId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
+        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (4, TType.STRING, 'userStorageResourceId', 'UTF8', None, ),  # 4
     )
 
-    def __init__(self, authzToken=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageResourceId=None,):
         self.authzToken = authzToken
+        self.userId = userId
+        self.gatewayID = gatewayID
+        self.userStorageResourceId = userStorageResourceId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -47018,10 +47255,25 @@ class getAllUserResourceProfiles_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRING:
+                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.userStorageResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -47031,17 +47283,35 @@ class getAllUserResourceProfiles_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllUserResourceProfiles_args')
+        oprot.writeStructBegin('getUserStoragePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
+        if self.userId is not None:
+            oprot.writeFieldBegin('userId', TType.STRING, 2)
+            oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
+            oprot.writeFieldEnd()
+        if self.gatewayID is not None:
+            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
+            oprot.writeFieldEnd()
+        if self.userStorageResourceId is not None:
+            oprot.writeFieldBegin('userStorageResourceId', TType.STRING, 4)
+            oprot.writeString(self.userStorageResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageResourceId)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
+        if self.userId is None:
+            raise TProtocolException(message='Required field userId is unset!')
+        if self.gatewayID is None:
+            raise TProtocolException(message='Required field gatewayID is unset!')
+        if self.userStorageResourceId is None:
+            raise TProtocolException(message='Required field userStorageResourceId is unset!')
         return
 
     def __repr__(self):
@@ -47056,7 +47326,7 @@ class getAllUserResourceProfiles_args(object):
         return not (self == other)
 
 
-class getAllUserResourceProfiles_result(object):
+class getUserStoragePreference_result(object):
     """
     Attributes:
      - success
@@ -47067,11 +47337,11 @@ class getAllUserResourceProfiles_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -47091,37 +47361,32 @@ class getAllUserResourceProfiles_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.LIST:
-                    self.success = []
-                    (_etype270, _size267) = iprot.readListBegin()
-                    for _i271 in range(_size267):
-                        _elem272 = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
-                        _elem272.read(iprot)
-                        self.success.append(_elem272)
-                    iprot.readListEnd()
+                if ftype == TType.STRUCT:
+                    self.success = airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
+                    self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -47134,13 +47399,10 @@ class getAllUserResourceProfiles_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllUserResourceProfiles_result')
+        oprot.writeStructBegin('getUserStoragePreference_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.LIST, 0)
-            oprot.writeListBegin(TType.STRUCT, len(self.success))
-            for iter273 in self.success:
-                iter273.write(oprot)
-            oprot.writeListEnd()
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -47176,31 +47438,25 @@ class getAllUserResourceProfiles_result(object):
         return not (self == other)
 
 
-class updateUserComputeResourcePreference_args(object):
+class getAllUserComputeResourcePreferences_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
-     - userComputeResourceId
-     - userComputeResourcePreference
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
-        (5, TType.STRUCT, 'userComputeResourcePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ),  # 5
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None, userComputeResourcePreference=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
-        self.userComputeResourceId = userComputeResourceId
-        self.userComputeResourcePreference = userComputeResourcePreference
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -47213,7 +47469,7 @@ class updateUserComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -47227,17 +47483,6 @@ class updateUserComputeResourcePreference_args(object):
                     self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.STRING:
-                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 5:
-                if ftype == TType.STRUCT:
-                    self.userComputeResourcePreference = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
-                    self.userComputeResourcePreference.read(iprot)
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -47247,7 +47492,7 @@ class updateUserComputeResourcePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateUserComputeResourcePreference_args')
+        oprot.writeStructBegin('getAllUserComputeResourcePreferences_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -47260,14 +47505,6 @@ class updateUserComputeResourcePreference_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
-        if self.userComputeResourceId is not None:
-            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
-            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
-            oprot.writeFieldEnd()
-        if self.userComputeResourcePreference is not None:
-            oprot.writeFieldBegin('userComputeResourcePreference', TType.STRUCT, 5)
-            self.userComputeResourcePreference.write(oprot)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -47278,10 +47515,6 @@ class updateUserComputeResourcePreference_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userComputeResourceId is None:
-            raise TProtocolException(message='Required field userComputeResourceId is unset!')
-        if self.userComputeResourcePreference is None:
-            raise TProtocolException(message='Required field userComputeResourcePreference is unset!')
         return
 
     def __repr__(self):
@@ -47296,7 +47529,7 @@ class updateUserComputeResourcePreference_args(object):
         return not (self == other)
 
 
-class updateUserComputeResourcePreference_result(object):
+class getAllUserComputeResourcePreferences_result(object):
     """
     Attributes:
      - success
@@ -47307,11 +47540,11 @@ class updateUserComputeResourcePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -47331,31 +47564,37 @@ class updateUserComputeResourcePreference_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype263, _size260) = iprot.readListBegin()
+                    for _i264 in range(_size260):
+                        _elem265 = airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
+                        _elem265.read(iprot)
+                        self.success.append(_elem265)
+                    iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -47368,10 +47607,13 @@ class updateUserComputeResourcePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateUserComputeResourcePreference_result')
+        oprot.writeStructBegin('getAllUserComputeResourcePreferences_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRUCT, len(self.success))
+            for iter266 in self.success:
+                iter266.write(oprot)
+            oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -47407,31 +47649,25 @@ class updateUserComputeResourcePreference_result(object):
         return not (self == other)
 
 
-class updateUserStoragePreference_args(object):
+class getAllUserStoragePreferences_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
-     - userStorageId
-     - userStoragePreference
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userStorageId', 'UTF8', None, ),  # 4
-        (5, TType.STRUCT, 'userStoragePreference', (apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), None, ),  # 5
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageId=None, userStoragePreference=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
-        self.userStorageId = userStorageId
-        self.userStoragePreference = userStoragePreference
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -47444,7 +47680,7 @@ class updateUserStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -47458,17 +47694,6 @@ class updateUserStoragePreference_args(object):
                     self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.STRING:
-                    self.userStorageId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 5:
-                if ftype == TType.STRUCT:
-                    self.userStoragePreference = apache.airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
-                    self.userStoragePreference.read(iprot)
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -47478,7 +47703,7 @@ class updateUserStoragePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateUserStoragePreference_args')
+        oprot.writeStructBegin('getAllUserStoragePreferences_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -47491,14 +47716,6 @@ class updateUserStoragePreference_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
-        if self.userStorageId is not None:
-            oprot.writeFieldBegin('userStorageId', TType.STRING, 4)
-            oprot.writeString(self.userStorageId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageId)
-            oprot.writeFieldEnd()
-        if self.userStoragePreference is not None:
-            oprot.writeFieldBegin('userStoragePreference', TType.STRUCT, 5)
-            self.userStoragePreference.write(oprot)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -47509,10 +47726,6 @@ class updateUserStoragePreference_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userStorageId is None:
-            raise TProtocolException(message='Required field userStorageId is unset!')
-        if self.userStoragePreference is None:
-            raise TProtocolException(message='Required field userStoragePreference is unset!')
         return
 
     def __repr__(self):
@@ -47527,7 +47740,7 @@ class updateUserStoragePreference_args(object):
         return not (self == other)
 
 
-class updateUserStoragePreference_result(object):
+class getAllUserStoragePreferences_result(object):
     """
     Attributes:
      - success
@@ -47538,11 +47751,11 @@ class updateUserStoragePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -47562,31 +47775,37 @@ class updateUserStoragePreference_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype270, _size267) = iprot.readListBegin()
+                    for _i271 in range(_size267):
+                        _elem272 = airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
+                        _elem272.read(iprot)
+                        self.success.append(_elem272)
+                    iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -47599,10 +47818,13 @@ class updateUserStoragePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateUserStoragePreference_result')
+        oprot.writeStructBegin('getAllUserStoragePreferences_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRUCT, len(self.success))
+            for iter273 in self.success:
+                iter273.write(oprot)
+            oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -47638,28 +47860,19 @@ class updateUserStoragePreference_result(object):
         return not (self == other)
 
 
-class deleteUserComputeResourcePreference_args(object):
+class getAllUserResourceProfiles_args(object):
     """
     Attributes:
      - authzToken
-     - userId
-     - gatewayID
-     - userComputeResourceId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None,):
+    def __init__(self, authzToken=None,):
         self.authzToken = authzToken
-        self.userId = userId
-        self.gatewayID = gatewayID
-        self.userComputeResourceId = userComputeResourceId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -47672,25 +47885,10 @@ class deleteUserComputeResourcePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
-            elif fid == 2:
-                if ftype == TType.STRING:
-                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRING:
-                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.STRING:
-                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -47700,35 +47898,17 @@ class deleteUserComputeResourcePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteUserComputeResourcePreference_args')
+        oprot.writeStructBegin('getAllUserResourceProfiles_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.userId is not None:
-            oprot.writeFieldBegin('userId', TType.STRING, 2)
-            oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
-            oprot.writeFieldEnd()
-        if self.gatewayID is not None:
-            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
-            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
-            oprot.writeFieldEnd()
-        if self.userComputeResourceId is not None:
-            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
-            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.userId is None:
-            raise TProtocolException(message='Required field userId is unset!')
-        if self.gatewayID is None:
-            raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userComputeResourceId is None:
-            raise TProtocolException(message='Required field userComputeResourceId is unset!')
         return
 
     def __repr__(self):
@@ -47743,7 +47923,7 @@ class deleteUserComputeResourcePreference_args(object):
         return not (self == other)
 
 
-class deleteUserComputeResourcePreference_result(object):
+class getAllUserResourceProfiles_result(object):
     """
     Attributes:
      - success
@@ -47754,11 +47934,11 @@ class deleteUserComputeResourcePreference_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile, airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -47778,31 +47958,37 @@ class deleteUserComputeResourcePreference_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype277, _size274) = iprot.readListBegin()
+                    for _i278 in range(_size274):
+                        _elem279 = airavata.model.appcatalog.userresourceprofile.ttypes.UserResourceProfile()
+                        _elem279.read(iprot)
+                        self.success.append(_elem279)
+                    iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -47815,10 +48001,13 @@ class deleteUserComputeResourcePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteUserComputeResourcePreference_result')
+        oprot.writeStructBegin('getAllUserResourceProfiles_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRUCT, len(self.success))
+            for iter280 in self.success:
+                iter280.write(oprot)
+            oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -47854,28 +48043,31 @@ class deleteUserComputeResourcePreference_result(object):
         return not (self == other)
 
 
-class deleteUserStoragePreference_args(object):
+class updateUserComputeResourcePreference_args(object):
     """
     Attributes:
      - authzToken
      - userId
      - gatewayID
-     - userStorageId
+     - userComputeResourceId
+     - userComputeResourcePreference
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'userStorageId', 'UTF8', None, ),  # 4
+        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
+        (5, TType.STRUCT, 'userComputeResourcePreference', (airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference.thrift_spec), None, ),  # 5
     )
 
-    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageId=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None, userComputeResourcePreference=None,):
         self.authzToken = authzToken
         self.userId = userId
         self.gatewayID = gatewayID
-        self.userStorageId = userStorageId
+        self.userComputeResourceId = userComputeResourceId
+        self.userComputeResourcePreference = userComputeResourcePreference
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -47888,7 +48080,7 @@ class deleteUserStoragePreference_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -47904,7 +48096,13 @@ class deleteUserStoragePreference_args(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRING:
-                    self.userStorageId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 5:
+                if ftype == TType.STRUCT:
+                    self.userComputeResourcePreference = airavata.model.appcatalog.userresourceprofile.ttypes.UserComputeResourcePreference()
+                    self.userComputeResourcePreference.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -47916,7 +48114,7 @@ class deleteUserStoragePreference_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteUserStoragePreference_args')
+        oprot.writeStructBegin('updateUserComputeResourcePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -47929,9 +48127,13 @@ class deleteUserStoragePreference_args(object):
             oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
             oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
             oprot.writeFieldEnd()
-        if self.userStorageId is not None:
-            oprot.writeFieldBegin('userStorageId', TType.STRING, 4)
-            oprot.writeString(self.userStorageId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageId)
+        if self.userComputeResourceId is not None:
+            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
+            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
+            oprot.writeFieldEnd()
+        if self.userComputeResourcePreference is not None:
+            oprot.writeFieldBegin('userComputeResourcePreference', TType.STRUCT, 5)
+            self.userComputeResourcePreference.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -47943,8 +48145,10 @@ class deleteUserStoragePreference_args(object):
             raise TProtocolException(message='Required field userId is unset!')
         if self.gatewayID is None:
             raise TProtocolException(message='Required field gatewayID is unset!')
-        if self.userStorageId is None:
-            raise TProtocolException(message='Required field userStorageId is unset!')
+        if self.userComputeResourceId is None:
+            raise TProtocolException(message='Required field userComputeResourceId is unset!')
+        if self.userComputeResourcePreference is None:
+            raise TProtocolException(message='Required field userComputeResourcePreference is unset!')
         return
 
     def __repr__(self):
@@ -47959,7 +48163,7 @@ class deleteUserStoragePreference_args(object):
         return not (self == other)
 
 
-class deleteUserStoragePreference_result(object):
+class updateUserComputeResourcePreference_result(object):
     """
     Attributes:
      - success
@@ -47971,10 +48175,10 @@ class deleteUserStoragePreference_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -48000,25 +48204,25 @@ class deleteUserStoragePreference_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -48031,7 +48235,7 @@ class deleteUserStoragePreference_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteUserStoragePreference_result')
+        oprot.writeStructBegin('updateUserComputeResourcePreference_result')
         if self.success is not None:
             oprot.writeFieldBegin('success', TType.BOOL, 0)
             oprot.writeBool(self.success)
@@ -48070,22 +48274,31 @@ class deleteUserStoragePreference_result(object):
         return not (self == other)
 
 
-class getAllWorkflows_args(object):
+class updateUserStoragePreference_args(object):
     """
     Attributes:
      - authzToken
-     - gatewayId
+     - userId
+     - gatewayID
+     - userStorageId
+     - userStoragePreference
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
+        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (4, TType.STRING, 'userStorageId', 'UTF8', None, ),  # 4
+        (5, TType.STRUCT, 'userStoragePreference', (airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference, airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference.thrift_spec), None, ),  # 5
     )
 
-    def __init__(self, authzToken=None, gatewayId=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageId=None, userStoragePreference=None,):
         self.authzToken = authzToken
-        self.gatewayId = gatewayId
+        self.userId = userId
+        self.gatewayID = gatewayID
+        self.userStorageId = userStorageId
+        self.userStoragePreference = userStoragePreference
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -48098,13 +48311,29 @@ class getAllWorkflows_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRING:
+                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.userStorageId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 5:
+                if ftype == TType.STRUCT:
+                    self.userStoragePreference = airavata.model.appcatalog.userresourceprofile.ttypes.UserStoragePreference()
+                    self.userStoragePreference.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -48116,14 +48345,26 @@ class getAllWorkflows_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllWorkflows_args')
+        oprot.writeStructBegin('updateUserStoragePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.gatewayId is not None:
-            oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
-            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
+        if self.userId is not None:
+            oprot.writeFieldBegin('userId', TType.STRING, 2)
+            oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
+            oprot.writeFieldEnd()
+        if self.gatewayID is not None:
+            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
+            oprot.writeFieldEnd()
+        if self.userStorageId is not None:
+            oprot.writeFieldBegin('userStorageId', TType.STRING, 4)
+            oprot.writeString(self.userStorageId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageId)
+            oprot.writeFieldEnd()
+        if self.userStoragePreference is not None:
+            oprot.writeFieldBegin('userStoragePreference', TType.STRUCT, 5)
+            self.userStoragePreference.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -48131,8 +48372,14 @@ class getAllWorkflows_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.gatewayId is None:
-            raise TProtocolException(message='Required field gatewayId is unset!')
+        if self.userId is None:
+            raise TProtocolException(message='Required field userId is unset!')
+        if self.gatewayID is None:
+            raise TProtocolException(message='Required field gatewayID is unset!')
+        if self.userStorageId is None:
+            raise TProtocolException(message='Required field userStorageId is unset!')
+        if self.userStoragePreference is None:
+            raise TProtocolException(message='Required field userStoragePreference is unset!')
         return
 
     def __repr__(self):
@@ -48147,7 +48394,7 @@ class getAllWorkflows_args(object):
         return not (self == other)
 
 
-class getAllWorkflows_result(object):
+class updateUserStoragePreference_result(object):
     """
     Attributes:
      - success
@@ -48158,11 +48405,11 @@ class getAllWorkflows_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -48182,36 +48429,31 @@ class getAllWorkflows_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.LIST:
-                    self.success = []
-                    (_etype277, _size274) = iprot.readListBegin()
-                    for _i278 in range(_size274):
-                        _elem279 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.success.append(_elem279)
-                    iprot.readListEnd()
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -48224,13 +48466,10 @@ class getAllWorkflows_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllWorkflows_result')
+        oprot.writeStructBegin('updateUserStoragePreference_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.LIST, 0)
-            oprot.writeListBegin(TType.STRING, len(self.success))
-            for iter280 in self.success:
-                oprot.writeString(iter280.encode('utf-8') if sys.version_info[0] == 2 else iter280)
-            oprot.writeListEnd()
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -48266,19 +48505,28 @@ class getAllWorkflows_result(object):
         return not (self == other)
 
 
-class getLatestQueueStatuses_args(object):
+class deleteUserComputeResourcePreference_args(object):
     """
     Attributes:
      - authzToken
+     - userId
+     - gatewayID
+     - userComputeResourceId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
+        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (4, TType.STRING, 'userComputeResourceId', 'UTF8', None, ),  # 4
     )
 
-    def __init__(self, authzToken=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userComputeResourceId=None,):
         self.authzToken = authzToken
+        self.userId = userId
+        self.gatewayID = gatewayID
+        self.userComputeResourceId = userComputeResourceId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -48291,10 +48539,25 @@ class getLatestQueueStatuses_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRING:
+                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.userComputeResourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -48304,17 +48567,35 @@ class getLatestQueueStatuses_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getLatestQueueStatuses_args')
+        oprot.writeStructBegin('deleteUserComputeResourcePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
+        if self.userId is not None:
+            oprot.writeFieldBegin('userId', TType.STRING, 2)
+            oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
+            oprot.writeFieldEnd()
+        if self.gatewayID is not None:
+            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
+            oprot.writeFieldEnd()
+        if self.userComputeResourceId is not None:
+            oprot.writeFieldBegin('userComputeResourceId', TType.STRING, 4)
+            oprot.writeString(self.userComputeResourceId.encode('utf-8') if sys.version_info[0] == 2 else self.userComputeResourceId)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
+        if self.userId is None:
+            raise TProtocolException(message='Required field userId is unset!')
+        if self.gatewayID is None:
+            raise TProtocolException(message='Required field gatewayID is unset!')
+        if self.userComputeResourceId is None:
+            raise TProtocolException(message='Required field userComputeResourceId is unset!')
         return
 
     def __repr__(self):
@@ -48329,7 +48610,7 @@ class getLatestQueueStatuses_args(object):
         return not (self == other)
 
 
-class getLatestQueueStatuses_result(object):
+class deleteUserComputeResourcePreference_result(object):
     """
     Attributes:
      - success
@@ -48340,11 +48621,11 @@ class getLatestQueueStatuses_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.status.ttypes.QueueStatusModel, apache.airavata.model.status.ttypes.QueueStatusModel.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -48364,37 +48645,31 @@ class getLatestQueueStatuses_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.LIST:
-                    self.success = []
-                    (_etype284, _size281) = iprot.readListBegin()
-                    for _i285 in range(_size281):
-                        _elem286 = apache.airavata.model.status.ttypes.QueueStatusModel()
-                        _elem286.read(iprot)
-                        self.success.append(_elem286)
-                    iprot.readListEnd()
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -48407,13 +48682,10 @@ class getLatestQueueStatuses_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getLatestQueueStatuses_result')
+        oprot.writeStructBegin('deleteUserComputeResourcePreference_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.LIST, 0)
-            oprot.writeListBegin(TType.STRUCT, len(self.success))
-            for iter287 in self.success:
-                iter287.write(oprot)
-            oprot.writeListEnd()
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -48449,22 +48721,28 @@ class getLatestQueueStatuses_result(object):
         return not (self == other)
 
 
-class getWorkflow_args(object):
+class deleteUserStoragePreference_args(object):
     """
     Attributes:
      - authzToken
-     - workflowTemplateId
+     - userId
+     - gatewayID
+     - userStorageId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
+        (3, TType.STRING, 'gatewayID', 'UTF8', None, ),  # 3
+        (4, TType.STRING, 'userStorageId', 'UTF8', None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, workflowTemplateId=None,):
+    def __init__(self, authzToken=None, userId=None, gatewayID=None, userStorageId=None,):
         self.authzToken = authzToken
-        self.workflowTemplateId = workflowTemplateId
+        self.userId = userId
+        self.gatewayID = gatewayID
+        self.userStorageId = userStorageId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -48477,13 +48755,23 @@ class getWorkflow_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.userId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRING:
+                    self.gatewayID = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.userStorageId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -48495,14 +48783,22 @@ class getWorkflow_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getWorkflow_args')
+        oprot.writeStructBegin('deleteUserStoragePreference_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.workflowTemplateId is not None:
-            oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
-            oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
+        if self.userId is not None:
+            oprot.writeFieldBegin('userId', TType.STRING, 2)
+            oprot.writeString(self.userId.encode('utf-8') if sys.version_info[0] == 2 else self.userId)
+            oprot.writeFieldEnd()
+        if self.gatewayID is not None:
+            oprot.writeFieldBegin('gatewayID', TType.STRING, 3)
+            oprot.writeString(self.gatewayID.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayID)
+            oprot.writeFieldEnd()
+        if self.userStorageId is not None:
+            oprot.writeFieldBegin('userStorageId', TType.STRING, 4)
+            oprot.writeString(self.userStorageId.encode('utf-8') if sys.version_info[0] == 2 else self.userStorageId)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -48510,8 +48806,12 @@ class getWorkflow_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.workflowTemplateId is None:
-            raise TProtocolException(message='Required field workflowTemplateId is unset!')
+        if self.userId is None:
+            raise TProtocolException(message='Required field userId is unset!')
+        if self.gatewayID is None:
+            raise TProtocolException(message='Required field gatewayID is unset!')
+        if self.userStorageId is None:
+            raise TProtocolException(message='Required field userStorageId is unset!')
         return
 
     def __repr__(self):
@@ -48526,7 +48826,7 @@ class getWorkflow_args(object):
         return not (self == other)
 
 
-class getWorkflow_result(object):
+class deleteUserStoragePreference_result(object):
     """
     Attributes:
      - success
@@ -48537,11 +48837,11 @@ class getWorkflow_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.workflow.ttypes.WorkflowModel, apache.airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -48561,32 +48861,31 @@ class getWorkflow_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.workflow.ttypes.WorkflowModel()
-                    self.success.read(iprot)
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -48599,10 +48898,10 @@ class getWorkflow_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getWorkflow_result')
+        oprot.writeStructBegin('deleteUserStoragePreference_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRUCT, 0)
-            self.success.write(oprot)
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -48638,22 +48937,22 @@ class getWorkflow_result(object):
         return not (self == other)
 
 
-class deleteWorkflow_args(object):
+class getAllWorkflows_args(object):
     """
     Attributes:
      - authzToken
-     - workflowTemplateId
+     - gatewayId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, workflowTemplateId=None,):
+    def __init__(self, authzToken=None, gatewayId=None,):
         self.authzToken = authzToken
-        self.workflowTemplateId = workflowTemplateId
+        self.gatewayId = gatewayId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -48666,13 +48965,13 @@ class deleteWorkflow_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -48684,14 +48983,14 @@ class deleteWorkflow_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteWorkflow_args')
+        oprot.writeStructBegin('getAllWorkflows_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.workflowTemplateId is not None:
-            oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
-            oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
+        if self.gatewayId is not None:
+            oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
+            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -48699,8 +48998,8 @@ class deleteWorkflow_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.workflowTemplateId is None:
-            raise TProtocolException(message='Required field workflowTemplateId is unset!')
+        if self.gatewayId is None:
+            raise TProtocolException(message='Required field gatewayId is unset!')
         return
 
     def __repr__(self):
@@ -48715,9 +49014,10 @@ class deleteWorkflow_args(object):
         return not (self == other)
 
 
-class deleteWorkflow_result(object):
+class getAllWorkflows_result(object):
     """
     Attributes:
+     - success
      - ire
      - ace
      - ase
@@ -48725,14 +49025,15 @@ class deleteWorkflow_result(object):
     """
 
     thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
-    def __init__(self, ire=None, ace=None, ase=None, ae=None,):
+    def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+        self.success = success
         self.ire = ire
         self.ace = ace
         self.ase = ase
@@ -48747,27 +49048,37 @@ class deleteWorkflow_result(object):
             (fname, ftype, fid) = iprot.readFieldBegin()
             if ftype == TType.STOP:
                 break
-            if fid == 1:
+            if fid == 0:
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype284, _size281) = iprot.readListBegin()
+                    for _i285 in range(_size281):
+                        _elem286 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.success.append(_elem286)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -48780,7 +49091,14 @@ class deleteWorkflow_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('deleteWorkflow_result')
+        oprot.writeStructBegin('getAllWorkflows_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRING, len(self.success))
+            for iter287 in self.success:
+                oprot.writeString(iter287.encode('utf-8') if sys.version_info[0] == 2 else iter287)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
             self.ire.write(oprot)
@@ -48815,25 +49133,19 @@ class deleteWorkflow_result(object):
         return not (self == other)
 
 
-class registerWorkflow_args(object):
+class getLatestQueueStatuses_args(object):
     """
     Attributes:
      - authzToken
-     - gatewayId
-     - workflow
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'workflow', (apache.airavata.model.workflow.ttypes.WorkflowModel, apache.airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ),  # 3
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
     )
 
-    def __init__(self, authzToken=None, gatewayId=None, workflow=None,):
+    def __init__(self, authzToken=None,):
         self.authzToken = authzToken
-        self.gatewayId = gatewayId
-        self.workflow = workflow
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -48846,21 +49158,10 @@ class registerWorkflow_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
-            elif fid == 2:
-                if ftype == TType.STRING:
-                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRUCT:
-                    self.workflow = apache.airavata.model.workflow.ttypes.WorkflowModel()
-                    self.workflow.read(iprot)
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -48870,29 +49171,17 @@ class registerWorkflow_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerWorkflow_args')
+        oprot.writeStructBegin('getLatestQueueStatuses_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.gatewayId is not None:
-            oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
-            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
-            oprot.writeFieldEnd()
-        if self.workflow is not None:
-            oprot.writeFieldBegin('workflow', TType.STRUCT, 3)
-            self.workflow.write(oprot)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.gatewayId is None:
-            raise TProtocolException(message='Required field gatewayId is unset!')
-        if self.workflow is None:
-            raise TProtocolException(message='Required field workflow is unset!')
         return
 
     def __repr__(self):
@@ -48907,7 +49196,7 @@ class registerWorkflow_args(object):
         return not (self == other)
 
 
-class registerWorkflow_result(object):
+class getLatestQueueStatuses_result(object):
     """
     Attributes:
      - success
@@ -48918,11 +49207,11 @@ class registerWorkflow_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.status.ttypes.QueueStatusModel, airavata.model.status.ttypes.QueueStatusModel.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -48942,31 +49231,37 @@ class registerWorkflow_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRING:
-                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype291, _size288) = iprot.readListBegin()
+                    for _i292 in range(_size288):
+                        _elem293 = airavata.model.status.ttypes.QueueStatusModel()
+                        _elem293.read(iprot)
+                        self.success.append(_elem293)
+                    iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -48979,10 +49274,13 @@ class registerWorkflow_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerWorkflow_result')
+        oprot.writeStructBegin('getLatestQueueStatuses_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRING, 0)
-            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRUCT, len(self.success))
+            for iter294 in self.success:
+                iter294.write(oprot)
+            oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -49018,25 +49316,22 @@ class registerWorkflow_result(object):
         return not (self == other)
 
 
-class updateWorkflow_args(object):
+class getWorkflow_args(object):
     """
     Attributes:
      - authzToken
      - workflowTemplateId
-     - workflow
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'workflow', (apache.airavata.model.workflow.ttypes.WorkflowModel, apache.airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, workflowTemplateId=None, workflow=None,):
+    def __init__(self, authzToken=None, workflowTemplateId=None,):
         self.authzToken = authzToken
         self.workflowTemplateId = workflowTemplateId
-        self.workflow = workflow
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -49049,7 +49344,7 @@ class updateWorkflow_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -49058,12 +49353,6 @@ class updateWorkflow_args(object):
                     self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.STRUCT:
-                    self.workflow = apache.airavata.model.workflow.ttypes.WorkflowModel()
-                    self.workflow.read(iprot)
-                else:
-                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -49073,7 +49362,7 @@ class updateWorkflow_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateWorkflow_args')
+        oprot.writeStructBegin('getWorkflow_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
@@ -49082,10 +49371,6 @@ class updateWorkflow_args(object):
             oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
             oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
             oprot.writeFieldEnd()
-        if self.workflow is not None:
-            oprot.writeFieldBegin('workflow', TType.STRUCT, 3)
-            self.workflow.write(oprot)
-            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -49094,8 +49379,6 @@ class updateWorkflow_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.workflowTemplateId is None:
             raise TProtocolException(message='Required field workflowTemplateId is unset!')
-        if self.workflow is None:
-            raise TProtocolException(message='Required field workflow is unset!')
         return
 
     def __repr__(self):
@@ -49110,9 +49393,10 @@ class updateWorkflow_args(object):
         return not (self == other)
 
 
-class updateWorkflow_result(object):
+class getWorkflow_result(object):
     """
     Attributes:
+     - success
      - ire
      - ace
      - ase
@@ -49120,14 +49404,15 @@ class updateWorkflow_result(object):
     """
 
     thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.workflow.ttypes.WorkflowModel, airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
-    def __init__(self, ire=None, ace=None, ase=None, ae=None,):
+    def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+        self.success = success
         self.ire = ire
         self.ace = ace
         self.ase = ase
@@ -49142,27 +49427,33 @@ class updateWorkflow_result(object):
             (fname, ftype, fid) = iprot.readFieldBegin()
             if ftype == TType.STOP:
                 break
-            if fid == 1:
+            if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.success = airavata.model.workflow.ttypes.WorkflowModel()
+                    self.success.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 1:
+                if ftype == TType.STRUCT:
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -49175,7 +49466,11 @@ class updateWorkflow_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('updateWorkflow_result')
+        oprot.writeStructBegin('getWorkflow_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
+            oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
             self.ire.write(oprot)
@@ -49210,22 +49505,22 @@ class updateWorkflow_result(object):
         return not (self == other)
 
 
-class getWorkflowTemplateId_args(object):
+class deleteWorkflow_args(object):
     """
     Attributes:
      - authzToken
-     - workflowName
+     - workflowTemplateId
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'workflowName', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, workflowName=None,):
+    def __init__(self, authzToken=None, workflowTemplateId=None,):
         self.authzToken = authzToken
-        self.workflowName = workflowName
+        self.workflowTemplateId = workflowTemplateId
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -49238,13 +49533,13 @@ class getWorkflowTemplateId_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.workflowName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -49256,14 +49551,14 @@ class getWorkflowTemplateId_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getWorkflowTemplateId_args')
+        oprot.writeStructBegin('deleteWorkflow_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.workflowName is not None:
-            oprot.writeFieldBegin('workflowName', TType.STRING, 2)
-            oprot.writeString(self.workflowName.encode('utf-8') if sys.version_info[0] == 2 else self.workflowName)
+        if self.workflowTemplateId is not None:
+            oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
+            oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -49271,8 +49566,8 @@ class getWorkflowTemplateId_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.workflowName is None:
-            raise TProtocolException(message='Required field workflowName is unset!')
+        if self.workflowTemplateId is None:
+            raise TProtocolException(message='Required field workflowTemplateId is unset!')
         return
 
     def __repr__(self):
@@ -49287,10 +49582,9 @@ class getWorkflowTemplateId_args(object):
         return not (self == other)
 
 
-class getWorkflowTemplateId_result(object):
+class deleteWorkflow_result(object):
     """
     Attributes:
-     - success
      - ire
      - ace
      - ase
@@ -49298,15 +49592,14 @@ class getWorkflowTemplateId_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        None,  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
-    def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
-        self.success = success
+    def __init__(self, ire=None, ace=None, ase=None, ae=None,):
         self.ire = ire
         self.ace = ace
         self.ase = ase
@@ -49321,32 +49614,27 @@ class getWorkflowTemplateId_result(object):
             (fname, ftype, fid) = iprot.readFieldBegin()
             if ftype == TType.STOP:
                 break
-            if fid == 0:
-                if ftype == TType.STRING:
-                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 1:
+            if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -49359,11 +49647,7 @@ class getWorkflowTemplateId_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getWorkflowTemplateId_result')
-        if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRING, 0)
-            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
-            oprot.writeFieldEnd()
+        oprot.writeStructBegin('deleteWorkflow_result')
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
             self.ire.write(oprot)
@@ -49398,22 +49682,25 @@ class getWorkflowTemplateId_result(object):
         return not (self == other)
 
 
-class isWorkflowExistWithName_args(object):
+class registerWorkflow_args(object):
     """
     Attributes:
      - authzToken
-     - workflowName
+     - gatewayId
+     - workflow
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'workflowName', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 2
+        (3, TType.STRUCT, 'workflow', (airavata.model.workflow.ttypes.WorkflowModel, airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, workflowName=None,):
+    def __init__(self, authzToken=None, gatewayId=None, workflow=None,):
         self.authzToken = authzToken
-        self.workflowName = workflowName
+        self.gatewayId = gatewayId
+        self.workflow = workflow
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -49426,13 +49713,19 @@ class isWorkflowExistWithName_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.workflowName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.gatewayId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRUCT:
+                    self.workflow = airavata.model.workflow.ttypes.WorkflowModel()
+                    self.workflow.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -49444,14 +49737,18 @@ class isWorkflowExistWithName_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('isWorkflowExistWithName_args')
+        oprot.writeStructBegin('registerWorkflow_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.workflowName is not None:
-            oprot.writeFieldBegin('workflowName', TType.STRING, 2)
-            oprot.writeString(self.workflowName.encode('utf-8') if sys.version_info[0] == 2 else self.workflowName)
+        if self.gatewayId is not None:
+            oprot.writeFieldBegin('gatewayId', TType.STRING, 2)
+            oprot.writeString(self.gatewayId.encode('utf-8') if sys.version_info[0] == 2 else self.gatewayId)
+            oprot.writeFieldEnd()
+        if self.workflow is not None:
+            oprot.writeFieldBegin('workflow', TType.STRUCT, 3)
+            self.workflow.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -49459,8 +49756,10 @@ class isWorkflowExistWithName_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.workflowName is None:
-            raise TProtocolException(message='Required field workflowName is unset!')
+        if self.gatewayId is None:
+            raise TProtocolException(message='Required field gatewayId is unset!')
+        if self.workflow is None:
+            raise TProtocolException(message='Required field workflow is unset!')
         return
 
     def __repr__(self):
@@ -49475,7 +49774,7 @@ class isWorkflowExistWithName_args(object):
         return not (self == other)
 
 
-class isWorkflowExistWithName_result(object):
+class registerWorkflow_result(object):
     """
     Attributes:
      - success
@@ -49486,11 +49785,11 @@ class isWorkflowExistWithName_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -49510,31 +49809,31 @@ class isWorkflowExistWithName_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -49547,10 +49846,10 @@ class isWorkflowExistWithName_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('isWorkflowExistWithName_result')
+        oprot.writeStructBegin('registerWorkflow_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -49586,22 +49885,25 @@ class isWorkflowExistWithName_result(object):
         return not (self == other)
 
 
-class registerDataProduct_args(object):
+class updateWorkflow_args(object):
     """
     Attributes:
      - authzToken
-     - dataProductModel
+     - workflowTemplateId
+     - workflow
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'dataProductModel', (apache.airavata.model.data.replica.ttypes.DataProductModel, apache.airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'workflowTemplateId', 'UTF8', None, ),  # 2
+        (3, TType.STRUCT, 'workflow', (airavata.model.workflow.ttypes.WorkflowModel, airavata.model.workflow.ttypes.WorkflowModel.thrift_spec), None, ),  # 3
     )
 
-    def __init__(self, authzToken=None, dataProductModel=None,):
+    def __init__(self, authzToken=None, workflowTemplateId=None, workflow=None,):
         self.authzToken = authzToken
-        self.dataProductModel = dataProductModel
+        self.workflowTemplateId = workflowTemplateId
+        self.workflow = workflow
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -49614,14 +49916,19 @@ class registerDataProduct_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
+                if ftype == TType.STRING:
+                    self.workflowTemplateId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.dataProductModel = apache.airavata.model.data.replica.ttypes.DataProductModel()
-                    self.dataProductModel.read(iprot)
+                    self.workflow = airavata.model.workflow.ttypes.WorkflowModel()
+                    self.workflow.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -49633,14 +49940,18 @@ class registerDataProduct_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerDataProduct_args')
+        oprot.writeStructBegin('updateWorkflow_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.dataProductModel is not None:
-            oprot.writeFieldBegin('dataProductModel', TType.STRUCT, 2)
-            self.dataProductModel.write(oprot)
+        if self.workflowTemplateId is not None:
+            oprot.writeFieldBegin('workflowTemplateId', TType.STRING, 2)
+            oprot.writeString(self.workflowTemplateId.encode('utf-8') if sys.version_info[0] == 2 else self.workflowTemplateId)
+            oprot.writeFieldEnd()
+        if self.workflow is not None:
+            oprot.writeFieldBegin('workflow', TType.STRUCT, 3)
+            self.workflow.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -49648,8 +49959,10 @@ class registerDataProduct_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.dataProductModel is None:
-            raise TProtocolException(message='Required field dataProductModel is unset!')
+        if self.workflowTemplateId is None:
+            raise TProtocolException(message='Required field workflowTemplateId is unset!')
+        if self.workflow is None:
+            raise TProtocolException(message='Required field workflow is unset!')
         return
 
     def __repr__(self):
@@ -49664,10 +49977,9 @@ class registerDataProduct_args(object):
         return not (self == other)
 
 
-class registerDataProduct_result(object):
+class updateWorkflow_result(object):
     """
     Attributes:
-     - success
      - ire
      - ace
      - ase
@@ -49675,15 +49987,14 @@ class registerDataProduct_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        None,  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
-    def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
-        self.success = success
+    def __init__(self, ire=None, ace=None, ase=None, ae=None,):
         self.ire = ire
         self.ace = ace
         self.ase = ase
@@ -49698,32 +50009,27 @@ class registerDataProduct_result(object):
             (fname, ftype, fid) = iprot.readFieldBegin()
             if ftype == TType.STOP:
                 break
-            if fid == 0:
-                if ftype == TType.STRING:
-                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 1:
+            if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -49736,11 +50042,7 @@ class registerDataProduct_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerDataProduct_result')
-        if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRING, 0)
-            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
-            oprot.writeFieldEnd()
+        oprot.writeStructBegin('updateWorkflow_result')
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
             self.ire.write(oprot)
@@ -49775,22 +50077,22 @@ class registerDataProduct_result(object):
         return not (self == other)
 
 
-class getDataProduct_args(object):
+class getWorkflowTemplateId_args(object):
     """
     Attributes:
      - authzToken
-     - dataProductUri
+     - workflowName
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'dataProductUri', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'workflowName', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, dataProductUri=None,):
+    def __init__(self, authzToken=None, workflowName=None,):
         self.authzToken = authzToken
-        self.dataProductUri = dataProductUri
+        self.workflowName = workflowName
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -49803,13 +50105,13 @@ class getDataProduct_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.dataProductUri = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.workflowName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -49821,14 +50123,14 @@ class getDataProduct_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getDataProduct_args')
+        oprot.writeStructBegin('getWorkflowTemplateId_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.dataProductUri is not None:
-            oprot.writeFieldBegin('dataProductUri', TType.STRING, 2)
-            oprot.writeString(self.dataProductUri.encode('utf-8') if sys.version_info[0] == 2 else self.dataProductUri)
+        if self.workflowName is not None:
+            oprot.writeFieldBegin('workflowName', TType.STRING, 2)
+            oprot.writeString(self.workflowName.encode('utf-8') if sys.version_info[0] == 2 else self.workflowName)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -49836,8 +50138,8 @@ class getDataProduct_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.dataProductUri is None:
-            raise TProtocolException(message='Required field dataProductUri is unset!')
+        if self.workflowName is None:
+            raise TProtocolException(message='Required field workflowName is unset!')
         return
 
     def __repr__(self):
@@ -49852,7 +50154,7 @@ class getDataProduct_args(object):
         return not (self == other)
 
 
-class getDataProduct_result(object):
+class getWorkflowTemplateId_result(object):
     """
     Attributes:
      - success
@@ -49863,11 +50165,11 @@ class getDataProduct_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.data.replica.ttypes.DataProductModel, apache.airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -49887,32 +50189,31 @@ class getDataProduct_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.data.replica.ttypes.DataProductModel()
-                    self.success.read(iprot)
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -49925,10 +50226,10 @@ class getDataProduct_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getDataProduct_result')
+        oprot.writeStructBegin('getWorkflowTemplateId_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRUCT, 0)
-            self.success.write(oprot)
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -49964,22 +50265,22 @@ class getDataProduct_result(object):
         return not (self == other)
 
 
-class registerReplicaLocation_args(object):
+class isWorkflowExistWithName_args(object):
     """
     Attributes:
      - authzToken
-     - replicaLocationModel
+     - workflowName
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'replicaLocationModel', (apache.airavata.model.data.replica.ttypes.DataReplicaLocationModel, apache.airavata.model.data.replica.ttypes.DataReplicaLocationModel.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'workflowName', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, replicaLocationModel=None,):
+    def __init__(self, authzToken=None, workflowName=None,):
         self.authzToken = authzToken
-        self.replicaLocationModel = replicaLocationModel
+        self.workflowName = workflowName
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -49992,14 +50293,13 @@ class registerReplicaLocation_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
-                if ftype == TType.STRUCT:
-                    self.replicaLocationModel = apache.airavata.model.data.replica.ttypes.DataReplicaLocationModel()
-                    self.replicaLocationModel.read(iprot)
+                if ftype == TType.STRING:
+                    self.workflowName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -50011,14 +50311,14 @@ class registerReplicaLocation_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerReplicaLocation_args')
+        oprot.writeStructBegin('isWorkflowExistWithName_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.replicaLocationModel is not None:
-            oprot.writeFieldBegin('replicaLocationModel', TType.STRUCT, 2)
-            self.replicaLocationModel.write(oprot)
+        if self.workflowName is not None:
+            oprot.writeFieldBegin('workflowName', TType.STRING, 2)
+            oprot.writeString(self.workflowName.encode('utf-8') if sys.version_info[0] == 2 else self.workflowName)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -50026,8 +50326,8 @@ class registerReplicaLocation_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.replicaLocationModel is None:
-            raise TProtocolException(message='Required field replicaLocationModel is unset!')
+        if self.workflowName is None:
+            raise TProtocolException(message='Required field workflowName is unset!')
         return
 
     def __repr__(self):
@@ -50042,7 +50342,7 @@ class registerReplicaLocation_args(object):
         return not (self == other)
 
 
-class registerReplicaLocation_result(object):
+class isWorkflowExistWithName_result(object):
     """
     Attributes:
      - success
@@ -50053,11 +50353,11 @@ class registerReplicaLocation_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -50077,31 +50377,31 @@ class registerReplicaLocation_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRING:
-                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -50114,10 +50414,10 @@ class registerReplicaLocation_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('registerReplicaLocation_result')
+        oprot.writeStructBegin('isWorkflowExistWithName_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRING, 0)
-            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -50153,22 +50453,22 @@ class registerReplicaLocation_result(object):
         return not (self == other)
 
 
-class getParentDataProduct_args(object):
+class registerDataProduct_args(object):
     """
     Attributes:
      - authzToken
-     - productUri
+     - dataProductModel
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'dataProductModel', (airavata.model.data.replica.ttypes.DataProductModel, airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, productUri=None,):
+    def __init__(self, authzToken=None, dataProductModel=None,):
         self.authzToken = authzToken
-        self.productUri = productUri
+        self.dataProductModel = dataProductModel
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -50181,13 +50481,14 @@ class getParentDataProduct_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
-                if ftype == TType.STRING:
-                    self.productUri = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                if ftype == TType.STRUCT:
+                    self.dataProductModel = airavata.model.data.replica.ttypes.DataProductModel()
+                    self.dataProductModel.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -50199,14 +50500,14 @@ class getParentDataProduct_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getParentDataProduct_args')
+        oprot.writeStructBegin('registerDataProduct_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.productUri is not None:
-            oprot.writeFieldBegin('productUri', TType.STRING, 2)
-            oprot.writeString(self.productUri.encode('utf-8') if sys.version_info[0] == 2 else self.productUri)
+        if self.dataProductModel is not None:
+            oprot.writeFieldBegin('dataProductModel', TType.STRUCT, 2)
+            self.dataProductModel.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -50214,8 +50515,8 @@ class getParentDataProduct_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.productUri is None:
-            raise TProtocolException(message='Required field productUri is unset!')
+        if self.dataProductModel is None:
+            raise TProtocolException(message='Required field dataProductModel is unset!')
         return
 
     def __repr__(self):
@@ -50230,7 +50531,7 @@ class getParentDataProduct_args(object):
         return not (self == other)
 
 
-class getParentDataProduct_result(object):
+class registerDataProduct_result(object):
     """
     Attributes:
      - success
@@ -50241,11 +50542,11 @@ class getParentDataProduct_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.data.replica.ttypes.DataProductModel, apache.airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -50265,32 +50566,31 @@ class getParentDataProduct_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.data.replica.ttypes.DataProductModel()
-                    self.success.read(iprot)
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -50303,10 +50603,10 @@ class getParentDataProduct_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getParentDataProduct_result')
+        oprot.writeStructBegin('registerDataProduct_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.STRUCT, 0)
-            self.success.write(oprot)
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -50342,22 +50642,22 @@ class getParentDataProduct_result(object):
         return not (self == other)
 
 
-class getChildDataProducts_args(object):
+class getDataProduct_args(object):
     """
     Attributes:
      - authzToken
-     - productUri
+     - dataProductUri
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'dataProductUri', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, productUri=None,):
+    def __init__(self, authzToken=None, dataProductUri=None,):
         self.authzToken = authzToken
-        self.productUri = productUri
+        self.dataProductUri = dataProductUri
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -50370,13 +50670,13 @@ class getChildDataProducts_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.productUri = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                    self.dataProductUri = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -50388,14 +50688,14 @@ class getChildDataProducts_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getChildDataProducts_args')
+        oprot.writeStructBegin('getDataProduct_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.productUri is not None:
-            oprot.writeFieldBegin('productUri', TType.STRING, 2)
-            oprot.writeString(self.productUri.encode('utf-8') if sys.version_info[0] == 2 else self.productUri)
+        if self.dataProductUri is not None:
+            oprot.writeFieldBegin('dataProductUri', TType.STRING, 2)
+            oprot.writeString(self.dataProductUri.encode('utf-8') if sys.version_info[0] == 2 else self.dataProductUri)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -50403,8 +50703,8 @@ class getChildDataProducts_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.productUri is None:
-            raise TProtocolException(message='Required field productUri is unset!')
+        if self.dataProductUri is None:
+            raise TProtocolException(message='Required field dataProductUri is unset!')
         return
 
     def __repr__(self):
@@ -50419,7 +50719,7 @@ class getChildDataProducts_args(object):
         return not (self == other)
 
 
-class getChildDataProducts_result(object):
+class getDataProduct_result(object):
     """
     Attributes:
      - success
@@ -50430,11 +50730,11 @@ class getChildDataProducts_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.data.replica.ttypes.DataProductModel, apache.airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.data.replica.ttypes.DataProductModel, airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -50454,37 +50754,32 @@ class getChildDataProducts_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.LIST:
-                    self.success = []
-                    (_etype291, _size288) = iprot.readListBegin()
-                    for _i292 in range(_size288):
-                        _elem293 = apache.airavata.model.data.replica.ttypes.DataProductModel()
-                        _elem293.read(iprot)
-                        self.success.append(_elem293)
-                    iprot.readListEnd()
+                if ftype == TType.STRUCT:
+                    self.success = airavata.model.data.replica.ttypes.DataProductModel()
+                    self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -50497,13 +50792,10 @@ class getChildDataProducts_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getChildDataProducts_result')
+        oprot.writeStructBegin('getDataProduct_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.LIST, 0)
-            oprot.writeListBegin(TType.STRUCT, len(self.success))
-            for iter294 in self.success:
-                iter294.write(oprot)
-            oprot.writeListEnd()
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -50539,28 +50831,22 @@ class getChildDataProducts_result(object):
         return not (self == other)
 
 
-class shareResourceWithUsers_args(object):
+class registerReplicaLocation_args(object):
     """
     Attributes:
      - authzToken
-     - resourceId
-     - resourceType
-     - userPermissionList
+     - replicaLocationModel
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
-        (4, TType.MAP, 'userPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'replicaLocationModel', (airavata.model.data.replica.ttypes.DataReplicaLocationModel, airavata.model.data.replica.ttypes.DataReplicaLocationModel.thrift_spec), None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, userPermissionList=None,):
+    def __init__(self, authzToken=None, replicaLocationModel=None,):
         self.authzToken = authzToken
-        self.resourceId = resourceId
-        self.resourceType = resourceType
-        self.userPermissionList = userPermissionList
+        self.replicaLocationModel = replicaLocationModel
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -50573,29 +50859,14 @@ class shareResourceWithUsers_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
-                if ftype == TType.STRING:
-                    self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.MAP:
-                    self.userPermissionList = {}
-                    (_ktype296, _vtype297, _size295) = iprot.readMapBegin()
-                    for _i299 in range(_size295):
-                        _key300 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        _val301 = iprot.readI32()
-                        self.userPermissionList[_key300] = _val301
-                    iprot.readMapEnd()
+                if ftype == TType.STRUCT:
+                    self.replicaLocationModel = airavata.model.data.replica.ttypes.DataReplicaLocationModel()
+                    self.replicaLocationModel.read(iprot)
                 else:
                     iprot.skip(ftype)
             else:
@@ -50607,26 +50878,14 @@ class shareResourceWithUsers_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('shareResourceWithUsers_args')
+        oprot.writeStructBegin('registerReplicaLocation_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.resourceId is not None:
-            oprot.writeFieldBegin('resourceId', TType.STRING, 2)
-            oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
-            oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
-        if self.userPermissionList is not None:
-            oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
-            oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
-            for kiter302, viter303 in self.userPermissionList.items():
-                oprot.writeString(kiter302.encode('utf-8') if sys.version_info[0] == 2 else kiter302)
-                oprot.writeI32(viter303)
-            oprot.writeMapEnd()
+        if self.replicaLocationModel is not None:
+            oprot.writeFieldBegin('replicaLocationModel', TType.STRUCT, 2)
+            self.replicaLocationModel.write(oprot)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -50634,10 +50893,8 @@ class shareResourceWithUsers_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.resourceId is None:
-            raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
+        if self.replicaLocationModel is None:
+            raise TProtocolException(message='Required field replicaLocationModel is unset!')
         return
 
     def __repr__(self):
@@ -50652,7 +50909,7 @@ class shareResourceWithUsers_args(object):
         return not (self == other)
 
 
-class shareResourceWithUsers_result(object):
+class registerReplicaLocation_result(object):
     """
     Attributes:
      - success
@@ -50663,11 +50920,11 @@ class shareResourceWithUsers_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -50687,31 +50944,31 @@ class shareResourceWithUsers_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -50724,10 +50981,10 @@ class shareResourceWithUsers_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('shareResourceWithUsers_result')
+        oprot.writeStructBegin('registerReplicaLocation_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.STRING, 0)
+            oprot.writeString(self.success.encode('utf-8') if sys.version_info[0] == 2 else self.success)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -50763,28 +51020,22 @@ class shareResourceWithUsers_result(object):
         return not (self == other)
 
 
-class revokeSharingOfResourceFromUsers_args(object):
+class getParentDataProduct_args(object):
     """
     Attributes:
      - authzToken
-     - resourceId
-     - resourceType
-     - userPermissionList
+     - productUri
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
-        (4, TType.MAP, 'userPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, userPermissionList=None,):
+    def __init__(self, authzToken=None, productUri=None,):
         self.authzToken = authzToken
-        self.resourceId = resourceId
-        self.resourceType = resourceType
-        self.userPermissionList = userPermissionList
+        self.productUri = productUri
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -50797,29 +51048,13 @@ class revokeSharingOfResourceFromUsers_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.MAP:
-                    self.userPermissionList = {}
-                    (_ktype305, _vtype306, _size304) = iprot.readMapBegin()
-                    for _i308 in range(_size304):
-                        _key309 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        _val310 = iprot.readI32()
-                        self.userPermissionList[_key309] = _val310
-                    iprot.readMapEnd()
+                    self.productUri = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -50831,26 +51066,14 @@ class revokeSharingOfResourceFromUsers_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('revokeSharingOfResourceFromUsers_args')
+        oprot.writeStructBegin('getParentDataProduct_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.resourceId is not None:
-            oprot.writeFieldBegin('resourceId', TType.STRING, 2)
-            oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
-            oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
-        if self.userPermissionList is not None:
-            oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
-            oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
-            for kiter311, viter312 in self.userPermissionList.items():
-                oprot.writeString(kiter311.encode('utf-8') if sys.version_info[0] == 2 else kiter311)
-                oprot.writeI32(viter312)
-            oprot.writeMapEnd()
+        if self.productUri is not None:
+            oprot.writeFieldBegin('productUri', TType.STRING, 2)
+            oprot.writeString(self.productUri.encode('utf-8') if sys.version_info[0] == 2 else self.productUri)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -50858,10 +51081,8 @@ class revokeSharingOfResourceFromUsers_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.resourceId is None:
-            raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
+        if self.productUri is None:
+            raise TProtocolException(message='Required field productUri is unset!')
         return
 
     def __repr__(self):
@@ -50876,7 +51097,7 @@ class revokeSharingOfResourceFromUsers_args(object):
         return not (self == other)
 
 
-class revokeSharingOfResourceFromUsers_result(object):
+class getParentDataProduct_result(object):
     """
     Attributes:
      - success
@@ -50887,11 +51108,11 @@ class revokeSharingOfResourceFromUsers_result(object):
     """
 
     thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.data.replica.ttypes.DataProductModel, airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -50911,31 +51132,32 @@ class revokeSharingOfResourceFromUsers_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.BOOL:
-                    self.success = iprot.readBool()
+                if ftype == TType.STRUCT:
+                    self.success = airavata.model.data.replica.ttypes.DataProductModel()
+                    self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -50948,10 +51170,10 @@ class revokeSharingOfResourceFromUsers_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('revokeSharingOfResourceFromUsers_result')
+        oprot.writeStructBegin('getParentDataProduct_result')
         if self.success is not None:
-            oprot.writeFieldBegin('success', TType.BOOL, 0)
-            oprot.writeBool(self.success)
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
             oprot.writeFieldEnd()
         if self.ire is not None:
             oprot.writeFieldBegin('ire', TType.STRUCT, 1)
@@ -50987,28 +51209,22 @@ class revokeSharingOfResourceFromUsers_result(object):
         return not (self == other)
 
 
-class getAllAccessibleUsers_args(object):
+class getChildDataProducts_args(object):
     """
     Attributes:
      - authzToken
-     - resourceId
-     - resourceType
-     - permissionType
+     - productUri
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
-        (4, TType.I32, 'permissionType', None, None, ),  # 4
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'productUri', 'UTF8', None, ),  # 2
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, permissionType=None,):
+    def __init__(self, authzToken=None, productUri=None,):
         self.authzToken = authzToken
-        self.resourceId = resourceId
-        self.resourceType = resourceType
-        self.permissionType = permissionType
+        self.productUri = productUri
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -51021,23 +51237,13 @@ class getAllAccessibleUsers_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRING:
-                    self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
-            elif fid == 4:
-                if ftype == TType.I32:
-                    self.permissionType = iprot.readI32()
+                    self.productUri = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
             else:
@@ -51049,22 +51255,14 @@ class getAllAccessibleUsers_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllAccessibleUsers_args')
+        oprot.writeStructBegin('getChildDataProducts_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.resourceId is not None:
-            oprot.writeFieldBegin('resourceId', TType.STRING, 2)
-            oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
-            oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
-        if self.permissionType is not None:
-            oprot.writeFieldBegin('permissionType', TType.I32, 4)
-            oprot.writeI32(self.permissionType)
+        if self.productUri is not None:
+            oprot.writeFieldBegin('productUri', TType.STRING, 2)
+            oprot.writeString(self.productUri.encode('utf-8') if sys.version_info[0] == 2 else self.productUri)
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -51072,12 +51270,8 @@ class getAllAccessibleUsers_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.resourceId is None:
-            raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
-        if self.permissionType is None:
-            raise TProtocolException(message='Required field permissionType is unset!')
+        if self.productUri is None:
+            raise TProtocolException(message='Required field productUri is unset!')
         return
 
     def __repr__(self):
@@ -51092,7 +51286,7 @@ class getAllAccessibleUsers_args(object):
         return not (self == other)
 
 
-class getAllAccessibleUsers_result(object):
+class getChildDataProducts_result(object):
     """
     Attributes:
      - success
@@ -51103,11 +51297,11 @@ class getAllAccessibleUsers_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.data.replica.ttypes.DataProductModel, airavata.model.data.replica.ttypes.DataProductModel.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -51129,34 +51323,35 @@ class getAllAccessibleUsers_result(object):
             if fid == 0:
                 if ftype == TType.LIST:
                     self.success = []
-                    (_etype316, _size313) = iprot.readListBegin()
-                    for _i317 in range(_size313):
-                        _elem318 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
-                        self.success.append(_elem318)
+                    (_etype298, _size295) = iprot.readListBegin()
+                    for _i299 in range(_size295):
+                        _elem300 = airavata.model.data.replica.ttypes.DataProductModel()
+                        _elem300.read(iprot)
+                        self.success.append(_elem300)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51169,12 +51364,12 @@ class getAllAccessibleUsers_result(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('getAllAccessibleUsers_result')
+        oprot.writeStructBegin('getChildDataProducts_result')
         if self.success is not None:
             oprot.writeFieldBegin('success', TType.LIST, 0)
-            oprot.writeListBegin(TType.STRING, len(self.success))
-            for iter319 in self.success:
-                oprot.writeString(iter319.encode('utf-8') if sys.version_info[0] == 2 else iter319)
+            oprot.writeListBegin(TType.STRUCT, len(self.success))
+            for iter301 in self.success:
+                iter301.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.ire is not None:
@@ -51211,22 +51406,28 @@ class getAllAccessibleUsers_result(object):
         return not (self == other)
 
 
-class createGroup_args(object):
+class shareResourceWithUsers_args(object):
     """
     Attributes:
      - authzToken
-     - groupModel
+     - resourceId
+     - resourceType
+     - userPermissionList
     """
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'groupModel', (apache.airavata.model.group.ttypes.GroupModel, apache.airavata.model.group.ttypes.GroupModel.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
+        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        (4, TType.MAP, 'userPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, groupModel=None,):
+    def __init__(self, authzToken=None, resourceId=None, resourceType=None, userPermissionList=None,):
         self.authzToken = authzToken
-        self.groupModel = groupModel
+        self.resourceId = resourceId
+        self.resourceType = resourceType
+        self.userPermissionList = userPermissionList
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -51239,14 +51440,29 @@ class createGroup_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
-                if ftype == TType.STRUCT:
-                    self.groupModel = apache.airavata.model.group.ttypes.GroupModel()
-                    self.groupModel.read(iprot)
+                if ftype == TType.STRING:
+                    self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.I32:
+                    self.resourceType = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.MAP:
+                    self.userPermissionList = {}
+                    (_ktype303, _vtype304, _size302) = iprot.readMapBegin()
+                    for _i306 in range(_size302):
+                        _key307 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        _val308 = iprot.readI32()
+                        self.userPermissionList[_key307] = _val308
+                    iprot.readMapEnd()
                 else:
                     iprot.skip(ftype)
             else:
@@ -51258,14 +51474,26 @@ class createGroup_args(object):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
             oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
             return
-        oprot.writeStructBegin('createGroup_args')
+        oprot.writeStructBegin('shareResourceWithUsers_args')
         if self.authzToken is not None:
             oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
             self.authzToken.write(oprot)
             oprot.writeFieldEnd()
-        if self.groupModel is not None:
-            oprot.writeFieldBegin('groupModel', TType.STRUCT, 2)
-            self.groupModel.write(oprot)
+        if self.resourceId is not None:
+            oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+            oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
+            oprot.writeFieldEnd()
+        if self.resourceType is not None:
+            oprot.writeFieldBegin('resourceType', TType.I32, 3)
+            oprot.writeI32(self.resourceType)
+            oprot.writeFieldEnd()
+        if self.userPermissionList is not None:
+            oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
+            oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
+            for kiter309, viter310 in self.userPermissionList.items():
+                oprot.writeString(kiter309.encode('utf-8') if sys.version_info[0] == 2 else kiter309)
+                oprot.writeI32(viter310)
+            oprot.writeMapEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
@@ -51273,8 +51501,10 @@ class createGroup_args(object):
     def validate(self):
         if self.authzToken is None:
             raise TProtocolException(message='Required field authzToken is unset!')
-        if self.groupModel is None:
-            raise TProtocolException(message='Required field groupModel is unset!')
+        if self.resourceId is None:
+            raise TProtocolException(message='Required field resourceId is unset!')
+        if self.resourceType is None:
+            raise TProtocolException(message='Required field resourceType is unset!')
         return
 
     def __repr__(self):
@@ -51289,7 +51519,7 @@ class createGroup_args(object):
         return not (self == other)
 
 
-class createGroup_result(object):
+class shareResourceWithUsers_result(object):
     """
     Attributes:
      - success
@@ -51300,11 +51530,11 @@ class createGroup_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -51324,31 +51554,668 @@ class createGroup_result(object):
             if ftype == TType.STOP:
                 break
             if fid == 0:
-                if ftype == TType.STRING:
-                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
+                    self.ae.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('shareResourceWithUsers_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
+            oprot.writeFieldEnd()
+        if self.ire is not None:
+            oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+            self.ire.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ace is not None:
+            oprot.writeFieldBegin('ace', TType.STRUCT, 2)
+            self.ace.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ase is not None:
+            oprot.writeFieldBegin('ase', TType.STRUCT, 3)
+            self.ase.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ae is not None:
+            oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+            self.ae.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class revokeSharingOfResourceFromUsers_args(object):
+    """
+    Attributes:
+     - authzToken
+     - resourceId
+     - resourceType
+     - userPermissionList
+    """
+
+    thrift_spec = (
+        None,  # 0
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
+        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        (4, TType.MAP, 'userPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
+    )
+
+    def __init__(self, authzToken=None, resourceId=None, resourceType=None, userPermissionList=None,):
+        self.authzToken = authzToken
+        self.resourceId = resourceId
+        self.resourceType = resourceType
+        self.userPermissionList = userPermissionList
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRUCT:
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.I32:
+                    self.resourceType = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.MAP:
+                    self.userPermissionList = {}
+                    (_ktype312, _vtype313, _size311) = iprot.readMapBegin()
+                    for _i315 in range(_size311):
+                        _key316 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        _val317 = iprot.readI32()
+                        self.userPermissionList[_key316] = _val317
+                    iprot.readMapEnd()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('revokeSharingOfResourceFromUsers_args')
+        if self.authzToken is not None:
+            oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+            self.authzToken.write(oprot)
+            oprot.writeFieldEnd()
+        if self.resourceId is not None:
+            oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+            oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
+            oprot.writeFieldEnd()
+        if self.resourceType is not None:
+            oprot.writeFieldBegin('resourceType', TType.I32, 3)
+            oprot.writeI32(self.resourceType)
+            oprot.writeFieldEnd()
+        if self.userPermissionList is not None:
+            oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
+            oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
+            for kiter318, viter319 in self.userPermissionList.items():
+                oprot.writeString(kiter318.encode('utf-8') if sys.version_info[0] == 2 else kiter318)
+                oprot.writeI32(viter319)
+            oprot.writeMapEnd()
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        if self.authzToken is None:
+            raise TProtocolException(message='Required field authzToken is unset!')
+        if self.resourceId is None:
+            raise TProtocolException(message='Required field resourceId is unset!')
+        if self.resourceType is None:
+            raise TProtocolException(message='Required field resourceType is unset!')
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class revokeSharingOfResourceFromUsers_result(object):
+    """
+    Attributes:
+     - success
+     - ire
+     - ace
+     - ase
+     - ae
+    """
+
+    thrift_spec = (
+        (0, TType.BOOL, 'success', None, None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+    )
+
+    def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+        self.success = success
+        self.ire = ire
+        self.ace = ace
+        self.ase = ase
+        self.ae = ae
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 1:
+                if ftype == TType.STRUCT:
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRUCT:
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
+                    self.ace.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRUCT:
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRUCT:
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
+                    self.ae.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('revokeSharingOfResourceFromUsers_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
+            oprot.writeFieldEnd()
+        if self.ire is not None:
+            oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+            self.ire.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ace is not None:
+            oprot.writeFieldBegin('ace', TType.STRUCT, 2)
+            self.ace.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ase is not None:
+            oprot.writeFieldBegin('ase', TType.STRUCT, 3)
+            self.ase.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ae is not None:
+            oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+            self.ae.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class getAllAccessibleUsers_args(object):
+    """
+    Attributes:
+     - authzToken
+     - resourceId
+     - resourceType
+     - permissionType
+    """
+
+    thrift_spec = (
+        None,  # 0
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
+        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        (4, TType.I32, 'permissionType', None, None, ),  # 4
+    )
+
+    def __init__(self, authzToken=None, resourceId=None, resourceType=None, permissionType=None,):
+        self.authzToken = authzToken
+        self.resourceId = resourceId
+        self.resourceType = resourceType
+        self.permissionType = permissionType
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRUCT:
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.I32:
+                    self.resourceType = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.I32:
+                    self.permissionType = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('getAllAccessibleUsers_args')
+        if self.authzToken is not None:
+            oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+            self.authzToken.write(oprot)
+            oprot.writeFieldEnd()
+        if self.resourceId is not None:
+            oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+            oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
+            oprot.writeFieldEnd()
+        if self.resourceType is not None:
+            oprot.writeFieldBegin('resourceType', TType.I32, 3)
+            oprot.writeI32(self.resourceType)
+            oprot.writeFieldEnd()
+        if self.permissionType is not None:
+            oprot.writeFieldBegin('permissionType', TType.I32, 4)
+            oprot.writeI32(self.permissionType)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        if self.authzToken is None:
+            raise TProtocolException(message='Required field authzToken is unset!')
+        if self.resourceId is None:
+            raise TProtocolException(message='Required field resourceId is unset!')
+        if self.resourceType is None:
+            raise TProtocolException(message='Required field resourceType is unset!')
+        if self.permissionType is None:
+            raise TProtocolException(message='Required field permissionType is unset!')
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class getAllAccessibleUsers_result(object):
+    """
+    Attributes:
+     - success
+     - ire
+     - ace
+     - ase
+     - ae
+    """
+
+    thrift_spec = (
+        (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+    )
+
+    def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+        self.success = success
+        self.ire = ire
+        self.ace = ace
+        self.ase = ase
+        self.ae = ae
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype323, _size320) = iprot.readListBegin()
+                    for _i324 in range(_size320):
+                        _elem325 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.success.append(_elem325)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 1:
+                if ftype == TType.STRUCT:
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRUCT:
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
+                    self.ace.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRUCT:
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRUCT:
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
+                    self.ae.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('getAllAccessibleUsers_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRING, len(self.success))
+            for iter326 in self.success:
+                oprot.writeString(iter326.encode('utf-8') if sys.version_info[0] == 2 else iter326)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.ire is not None:
+            oprot.writeFieldBegin('ire', TType.STRUCT, 1)
+            self.ire.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ace is not None:
+            oprot.writeFieldBegin('ace', TType.STRUCT, 2)
+            self.ace.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ase is not None:
+            oprot.writeFieldBegin('ase', TType.STRUCT, 3)
+            self.ase.write(oprot)
+            oprot.writeFieldEnd()
+        if self.ae is not None:
+            oprot.writeFieldBegin('ae', TType.STRUCT, 4)
+            self.ae.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class createGroup_args(object):
+    """
+    Attributes:
+     - authzToken
+     - groupModel
+    """
+
+    thrift_spec = (
+        None,  # 0
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'groupModel', (airavata.model.group.ttypes.GroupModel, airavata.model.group.ttypes.GroupModel.thrift_spec), None, ),  # 2
+    )
+
+    def __init__(self, authzToken=None, groupModel=None,):
+        self.authzToken = authzToken
+        self.groupModel = groupModel
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRUCT:
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRUCT:
+                    self.groupModel = airavata.model.group.ttypes.GroupModel()
+                    self.groupModel.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('createGroup_args')
+        if self.authzToken is not None:
+            oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
+            self.authzToken.write(oprot)
+            oprot.writeFieldEnd()
+        if self.groupModel is not None:
+            oprot.writeFieldBegin('groupModel', TType.STRUCT, 2)
+            self.groupModel.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        if self.authzToken is None:
+            raise TProtocolException(message='Required field authzToken is unset!')
+        if self.groupModel is None:
+            raise TProtocolException(message='Required field groupModel is unset!')
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class createGroup_result(object):
+    """
+    Attributes:
+     - success
+     - ire
+     - ace
+     - ase
+     - ae
+    """
+
+    thrift_spec = (
+        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+    )
+
+    def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
+        self.success = success
+        self.ire = ire
+        self.ace = ace
+        self.ase = ase
+        self.ae = ae
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRING:
+                    self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 1:
+                if ftype == TType.STRUCT:
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRUCT:
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
+                    self.ace.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRUCT:
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRUCT:
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51409,8 +52276,8 @@ class updateGroup_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'groupModel', (apache.airavata.model.group.ttypes.GroupModel, apache.airavata.model.group.ttypes.GroupModel.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'groupModel', (airavata.model.group.ttypes.GroupModel, airavata.model.group.ttypes.GroupModel.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, authzToken=None, groupModel=None,):
@@ -51428,13 +52295,13 @@ class updateGroup_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.groupModel = apache.airavata.model.group.ttypes.GroupModel()
+                    self.groupModel = airavata.model.group.ttypes.GroupModel()
                     self.groupModel.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51490,10 +52357,10 @@ class updateGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -51519,25 +52386,25 @@ class updateGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51599,7 +52466,7 @@ class deleteGroup_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'groupId', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'ownerId', 'UTF8', None, ),  # 3
     )
@@ -51620,7 +52487,7 @@ class deleteGroup_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51692,10 +52559,10 @@ class deleteGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -51721,25 +52588,25 @@ class deleteGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51800,7 +52667,7 @@ class getGroup_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'groupId', 'UTF8', None, ),  # 2
     )
 
@@ -51819,7 +52686,7 @@ class getGroup_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51879,11 +52746,11 @@ class getGroup_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.group.ttypes.GroupModel, apache.airavata.model.group.ttypes.GroupModel.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.STRUCT, 'success', (airavata.model.group.ttypes.GroupModel, airavata.model.group.ttypes.GroupModel.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -51904,31 +52771,31 @@ class getGroup_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.group.ttypes.GroupModel()
+                    self.success = airavata.model.group.ttypes.GroupModel()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -51989,7 +52856,7 @@ class getAllGroupsUserBelongs_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'userName', 'UTF8', None, ),  # 2
     )
 
@@ -52008,7 +52875,7 @@ class getAllGroupsUserBelongs_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.authzToken = apache.airavata.model.security.ttypes.AuthzToken()
+                    self.authzToken = airavata.model.security.ttypes.AuthzToken()
                     self.authzToken.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -52068,11 +52935,11 @@ class getAllGroupsUserBelongs_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.group.ttypes.GroupModel, apache.airavata.model.group.ttypes.GroupModel.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ae', (apache.airavata.api.error.ttypes.AuthorizationException, apache.airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.group.ttypes.GroupModel, airavata.model.group.ttypes.GroupModel.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'ire', (airavata.api.error.ttypes.InvalidRequestException, airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'ace', (airavata.api.error.ttypes.AiravataClientException, airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ),  # 2
+        (3, TType.STRUCT, 'ase', (airavata.api.error.ttypes.AiravataSystemException, airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ),  # 3
+        (4, TType.STRUCT, 'ae', (airavata.api.error.ttypes.AuthorizationException, airavata.api.error.ttypes.AuthorizationException.thrift_spec), None, ),  # 4
     )
 
     def __init__(self, success=None, ire=None, ace=None, ase=None, ae=None,):
@@ -52094,35 +52961,35 @@ class getAllGroupsUserBelongs_result(object):
             if fid == 0:
                 if ftype == TType.LIST:
                     self.success = []
-                    (_etype323, _size320) = iprot.readListBegin()
-                    for _i324 in range(_size320):
-                        _elem325 = apache.airavata.model.group.ttypes.GroupModel()
-                        _elem325.read(iprot)
-                        self.success.append(_elem325)
+                    (_etype330, _size327) = iprot.readListBegin()
+                    for _i331 in range(_size327):
+                        _elem332 = airavata.model.group.ttypes.GroupModel()
+                        _elem332.read(iprot)
+                        self.success.append(_elem332)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.ire = apache.airavata.api.error.ttypes.InvalidRequestException()
+                    self.ire = airavata.api.error.ttypes.InvalidRequestException()
                     self.ire.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.ace = apache.airavata.api.error.ttypes.AiravataClientException()
+                    self.ace = airavata.api.error.ttypes.AiravataClientException()
                     self.ace.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 3:
                 if ftype == TType.STRUCT:
-                    self.ase = apache.airavata.api.error.ttypes.AiravataSystemException()
+                    self.ase = airavata.api.error.ttypes.AiravataSystemException()
                     self.ase.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.ae = apache.airavata.api.error.ttypes.AuthorizationException()
+                    self.ae = airavata.api.error.ttypes.AuthorizationException()
                     self.ae.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -52139,8 +53006,8 @@ class getAllGroupsUserBelongs_result(object):
         if self.success is not None:
             oprot.writeFieldBegin('success', TType.LIST, 0)
             oprot.writeListBegin(TType.STRUCT, len(self.success))
-            for iter326 in self.success:
-                iter326.write(oprot)
+            for iter333 in self.success:
+                iter333.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.ire is not None:
diff --git a/apache/airavata/api/__init__.py b/airavata/api/__init__.py
similarity index 100%
rename from apache/airavata/api/__init__.py
rename to airavata/api/__init__.py
diff --git a/apache/airavata/api/constants.py b/airavata/api/constants.py
similarity index 100%
rename from apache/airavata/api/constants.py
rename to airavata/api/constants.py
diff --git a/credential_store_data_models/__init__.py b/airavata/api/error/__init__.py
similarity index 100%
copy from credential_store_data_models/__init__.py
copy to airavata/api/error/__init__.py
diff --git a/apache/airavata/model/workspace/constants.py b/airavata/api/error/constants.py
similarity index 100%
copy from apache/airavata/model/workspace/constants.py
copy to airavata/api/error/constants.py
diff --git a/apache/airavata/api/error/ttypes.py b/airavata/api/error/ttypes.py
similarity index 99%
rename from apache/airavata/api/error/ttypes.py
rename to airavata/api/error/ttypes.py
index 390ffe8..3f1761f 100644
--- a/apache/airavata/api/error/ttypes.py
+++ b/airavata/api/error/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.experiment.ttypes
+import airavata.model.experiment.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/apache/airavata/api/sharing/SharingRegistryService-remote b/airavata/api/sharing/SharingRegistryService-remote
old mode 100644
new mode 100755
similarity index 99%
rename from apache/airavata/api/sharing/SharingRegistryService-remote
rename to airavata/api/sharing/SharingRegistryService-remote
index dacc90a..e2f371e
--- a/apache/airavata/api/sharing/SharingRegistryService-remote
+++ b/airavata/api/sharing/SharingRegistryService-remote
@@ -16,8 +16,8 @@ else:
 from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient
 from thrift.protocol.TBinaryProtocol import TBinaryProtocol
 
-from apache.airavata.api.sharing import SharingRegistryService
-from apache.airavata.api.sharing.ttypes import *
+from airavata.api.sharing import SharingRegistryService
+from airavata.api.sharing.ttypes import *
 
 if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('')
diff --git a/apache/airavata/api/sharing/SharingRegistryService.py b/airavata/api/sharing/SharingRegistryService.py
similarity index 93%
rename from apache/airavata/api/sharing/SharingRegistryService.py
rename to airavata/api/sharing/SharingRegistryService.py
index 5276063..af769d7 100644
--- a/apache/airavata/api/sharing/SharingRegistryService.py
+++ b/airavata/api/sharing/SharingRegistryService.py
@@ -2505,10 +2505,10 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
-        except apache.airavata.model.sharing.ttypes.DuplicateEntryException as dee:
+        except airavata.model.sharing.ttypes.DuplicateEntryException as dee:
             msg_type = TMessageType.REPLY
             result.dee = dee
         except Exception as ex:
@@ -2530,7 +2530,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2552,7 +2552,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2574,7 +2574,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2596,7 +2596,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2618,7 +2618,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2640,10 +2640,10 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
-        except apache.airavata.model.sharing.ttypes.DuplicateEntryException as dee:
+        except airavata.model.sharing.ttypes.DuplicateEntryException as dee:
             msg_type = TMessageType.REPLY
             result.dee = dee
         except Exception as ex:
@@ -2665,7 +2665,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2687,7 +2687,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2709,7 +2709,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2731,7 +2731,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2753,7 +2753,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2775,7 +2775,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2797,7 +2797,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2819,7 +2819,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2841,7 +2841,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2863,7 +2863,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2904,7 +2904,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2926,7 +2926,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2948,7 +2948,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2970,7 +2970,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -2992,7 +2992,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3014,7 +3014,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3036,7 +3036,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3058,10 +3058,10 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
-        except apache.airavata.model.sharing.ttypes.DuplicateEntryException as dee:
+        except airavata.model.sharing.ttypes.DuplicateEntryException as dee:
             msg_type = TMessageType.REPLY
             result.dee = dee
         except Exception as ex:
@@ -3083,7 +3083,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3105,7 +3105,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3127,7 +3127,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3149,7 +3149,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3171,7 +3171,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3193,7 +3193,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3215,7 +3215,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3237,7 +3237,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3259,7 +3259,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3281,7 +3281,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3303,7 +3303,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3325,7 +3325,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3347,7 +3347,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3369,10 +3369,10 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
-        except apache.airavata.model.sharing.ttypes.DuplicateEntryException as dee:
+        except airavata.model.sharing.ttypes.DuplicateEntryException as dee:
             msg_type = TMessageType.REPLY
             result.dee = dee
         except Exception as ex:
@@ -3394,7 +3394,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3416,7 +3416,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3438,7 +3438,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3460,7 +3460,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3482,7 +3482,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3504,7 +3504,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3526,7 +3526,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3548,7 +3548,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3570,7 +3570,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3592,7 +3592,7 @@ class Processor(Iface, TProcessor):
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
-        except apache.airavata.model.sharing.ttypes.SharingRegistryException as sre:
+        except airavata.model.sharing.ttypes.SharingRegistryException as sre:
             msg_type = TMessageType.REPLY
             result.sre = sre
         except Exception as ex:
@@ -3615,7 +3615,7 @@ class createDomain_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'domain', (apache.airavata.model.sharing.ttypes.Domain, apache.airavata.model.sharing.ttypes.Domain.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'domain', (airavata.model.sharing.ttypes.Domain, airavata.model.sharing.ttypes.Domain.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, domain=None,):
@@ -3632,7 +3632,7 @@ class createDomain_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.domain = apache.airavata.model.sharing.ttypes.Domain()
+                    self.domain = airavata.model.sharing.ttypes.Domain()
                     self.domain.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -3680,8 +3680,8 @@ class createDomain_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'dee', (apache.airavata.model.sharing.ttypes.DuplicateEntryException, apache.airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'dee', (airavata.model.sharing.ttypes.DuplicateEntryException, airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, success=None, sre=None, dee=None,):
@@ -3705,13 +3705,13 @@ class createDomain_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.dee = apache.airavata.model.sharing.ttypes.DuplicateEntryException()
+                    self.dee = airavata.model.sharing.ttypes.DuplicateEntryException()
                     self.dee.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -3763,7 +3763,7 @@ class updateDomain_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'domain', (apache.airavata.model.sharing.ttypes.Domain, apache.airavata.model.sharing.ttypes.Domain.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'domain', (airavata.model.sharing.ttypes.Domain, airavata.model.sharing.ttypes.Domain.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, domain=None,):
@@ -3780,7 +3780,7 @@ class updateDomain_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.domain = apache.airavata.model.sharing.ttypes.Domain()
+                    self.domain = airavata.model.sharing.ttypes.Domain()
                     self.domain.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -3827,7 +3827,7 @@ class updateDomain_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -3850,7 +3850,7 @@ class updateDomain_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -3961,7 +3961,7 @@ class isDomainExists_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -3984,7 +3984,7 @@ class isDomainExists_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4095,7 +4095,7 @@ class deleteDomain_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -4118,7 +4118,7 @@ class deleteDomain_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4228,8 +4228,8 @@ class getDomain_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.sharing.ttypes.Domain, apache.airavata.model.sharing.ttypes.Domain.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.STRUCT, 'success', (airavata.model.sharing.ttypes.Domain, airavata.model.sharing.ttypes.Domain.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -4247,13 +4247,13 @@ class getDomain_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.sharing.ttypes.Domain()
+                    self.success = airavata.model.sharing.ttypes.Domain()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4377,8 +4377,8 @@ class getDomains_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.Domain, apache.airavata.model.sharing.ttypes.Domain.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.Domain, airavata.model.sharing.ttypes.Domain.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -4399,7 +4399,7 @@ class getDomains_result(object):
                     self.success = []
                     (_etype3, _size0) = iprot.readListBegin()
                     for _i4 in range(_size0):
-                        _elem5 = apache.airavata.model.sharing.ttypes.Domain()
+                        _elem5 = airavata.model.sharing.ttypes.Domain()
                         _elem5.read(iprot)
                         self.success.append(_elem5)
                     iprot.readListEnd()
@@ -4407,7 +4407,7 @@ class getDomains_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4458,7 +4458,7 @@ class createUser_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'user', (apache.airavata.model.sharing.ttypes.User, apache.airavata.model.sharing.ttypes.User.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'user', (airavata.model.sharing.ttypes.User, airavata.model.sharing.ttypes.User.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, user=None,):
@@ -4475,7 +4475,7 @@ class createUser_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.user = apache.airavata.model.sharing.ttypes.User()
+                    self.user = airavata.model.sharing.ttypes.User()
                     self.user.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4523,8 +4523,8 @@ class createUser_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'dee', (apache.airavata.model.sharing.ttypes.DuplicateEntryException, apache.airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'dee', (airavata.model.sharing.ttypes.DuplicateEntryException, airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, success=None, sre=None, dee=None,):
@@ -4548,13 +4548,13 @@ class createUser_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.dee = apache.airavata.model.sharing.ttypes.DuplicateEntryException()
+                    self.dee = airavata.model.sharing.ttypes.DuplicateEntryException()
                     self.dee.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4606,7 +4606,7 @@ class updatedUser_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'user', (apache.airavata.model.sharing.ttypes.User, apache.airavata.model.sharing.ttypes.User.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'user', (airavata.model.sharing.ttypes.User, airavata.model.sharing.ttypes.User.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, user=None,):
@@ -4623,7 +4623,7 @@ class updatedUser_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.user = apache.airavata.model.sharing.ttypes.User()
+                    self.user = airavata.model.sharing.ttypes.User()
                     self.user.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4670,7 +4670,7 @@ class updatedUser_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -4693,7 +4693,7 @@ class updatedUser_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4818,7 +4818,7 @@ class isUserExists_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -4841,7 +4841,7 @@ class isUserExists_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -4966,7 +4966,7 @@ class deleteUser_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -4989,7 +4989,7 @@ class deleteUser_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5113,8 +5113,8 @@ class getUser_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.sharing.ttypes.User, apache.airavata.model.sharing.ttypes.User.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.STRUCT, 'success', (airavata.model.sharing.ttypes.User, airavata.model.sharing.ttypes.User.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -5132,13 +5132,13 @@ class getUser_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.sharing.ttypes.User()
+                    self.success = airavata.model.sharing.ttypes.User()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5276,8 +5276,8 @@ class getUsers_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.User, apache.airavata.model.sharing.ttypes.User.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.User, airavata.model.sharing.ttypes.User.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -5298,7 +5298,7 @@ class getUsers_result(object):
                     self.success = []
                     (_etype10, _size7) = iprot.readListBegin()
                     for _i11 in range(_size7):
-                        _elem12 = apache.airavata.model.sharing.ttypes.User()
+                        _elem12 = airavata.model.sharing.ttypes.User()
                         _elem12.read(iprot)
                         self.success.append(_elem12)
                     iprot.readListEnd()
@@ -5306,7 +5306,7 @@ class getUsers_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5357,7 +5357,7 @@ class createGroup_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'group', (apache.airavata.model.sharing.ttypes.UserGroup, apache.airavata.model.sharing.ttypes.UserGroup.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'group', (airavata.model.sharing.ttypes.UserGroup, airavata.model.sharing.ttypes.UserGroup.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, group=None,):
@@ -5374,7 +5374,7 @@ class createGroup_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.group = apache.airavata.model.sharing.ttypes.UserGroup()
+                    self.group = airavata.model.sharing.ttypes.UserGroup()
                     self.group.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5421,7 +5421,7 @@ class createGroup_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -5444,7 +5444,7 @@ class createGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5492,7 +5492,7 @@ class updateGroup_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'group', (apache.airavata.model.sharing.ttypes.UserGroup, apache.airavata.model.sharing.ttypes.UserGroup.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'group', (airavata.model.sharing.ttypes.UserGroup, airavata.model.sharing.ttypes.UserGroup.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, group=None,):
@@ -5509,7 +5509,7 @@ class updateGroup_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.group = apache.airavata.model.sharing.ttypes.UserGroup()
+                    self.group = airavata.model.sharing.ttypes.UserGroup()
                     self.group.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5556,7 +5556,7 @@ class updateGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -5579,7 +5579,7 @@ class updateGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5704,7 +5704,7 @@ class isGroupExists_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -5727,7 +5727,7 @@ class isGroupExists_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5852,7 +5852,7 @@ class deleteGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -5875,7 +5875,7 @@ class deleteGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -5999,8 +5999,8 @@ class getGroup_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.sharing.ttypes.UserGroup, apache.airavata.model.sharing.ttypes.UserGroup.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.STRUCT, 'success', (airavata.model.sharing.ttypes.UserGroup, airavata.model.sharing.ttypes.UserGroup.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -6018,13 +6018,13 @@ class getGroup_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.sharing.ttypes.UserGroup()
+                    self.success = airavata.model.sharing.ttypes.UserGroup()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -6161,7 +6161,7 @@ class getGroups_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.UserGroup, apache.airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.UserGroup, airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
     )
 
     def __init__(self, success=None,):
@@ -6181,7 +6181,7 @@ class getGroups_result(object):
                     self.success = []
                     (_etype17, _size14) = iprot.readListBegin()
                     for _i18 in range(_size14):
-                        _elem19 = apache.airavata.model.sharing.ttypes.UserGroup()
+                        _elem19 = airavata.model.sharing.ttypes.UserGroup()
                         _elem19.read(iprot)
                         self.success.append(_elem19)
                     iprot.readListEnd()
@@ -6329,7 +6329,7 @@ class addUsersToGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -6352,7 +6352,7 @@ class addUsersToGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -6499,7 +6499,7 @@ class removeUsersFromGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -6522,7 +6522,7 @@ class removeUsersFromGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -6672,8 +6672,8 @@ class getGroupMembersOfTypeUser_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.User, apache.airavata.model.sharing.ttypes.User.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.User, airavata.model.sharing.ttypes.User.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -6694,7 +6694,7 @@ class getGroupMembersOfTypeUser_result(object):
                     self.success = []
                     (_etype38, _size35) = iprot.readListBegin()
                     for _i39 in range(_size35):
-                        _elem40 = apache.airavata.model.sharing.ttypes.User()
+                        _elem40 = airavata.model.sharing.ttypes.User()
                         _elem40.read(iprot)
                         self.success.append(_elem40)
                     iprot.readListEnd()
@@ -6702,7 +6702,7 @@ class getGroupMembersOfTypeUser_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -6857,8 +6857,8 @@ class getGroupMembersOfTypeGroup_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.UserGroup, apache.airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.UserGroup, airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -6879,7 +6879,7 @@ class getGroupMembersOfTypeGroup_result(object):
                     self.success = []
                     (_etype45, _size42) = iprot.readListBegin()
                     for _i46 in range(_size42):
-                        _elem47 = apache.airavata.model.sharing.ttypes.UserGroup()
+                        _elem47 = airavata.model.sharing.ttypes.UserGroup()
                         _elem47.read(iprot)
                         self.success.append(_elem47)
                     iprot.readListEnd()
@@ -6887,7 +6887,7 @@ class getGroupMembersOfTypeGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7037,7 +7037,7 @@ class addChildGroupsToParentGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -7060,7 +7060,7 @@ class addChildGroupsToParentGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7199,7 +7199,7 @@ class removeChildGroupFromParentGroup_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -7222,7 +7222,7 @@ class removeChildGroupFromParentGroup_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7346,8 +7346,8 @@ class getAllMemberGroupsForUser_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.UserGroup, apache.airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.UserGroup, airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -7368,7 +7368,7 @@ class getAllMemberGroupsForUser_result(object):
                     self.success = []
                     (_etype59, _size56) = iprot.readListBegin()
                     for _i60 in range(_size56):
-                        _elem61 = apache.airavata.model.sharing.ttypes.UserGroup()
+                        _elem61 = airavata.model.sharing.ttypes.UserGroup()
                         _elem61.read(iprot)
                         self.success.append(_elem61)
                     iprot.readListEnd()
@@ -7376,7 +7376,7 @@ class getAllMemberGroupsForUser_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7427,7 +7427,7 @@ class createEntityType_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'entityType', (apache.airavata.model.sharing.ttypes.EntityType, apache.airavata.model.sharing.ttypes.EntityType.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'entityType', (airavata.model.sharing.ttypes.EntityType, airavata.model.sharing.ttypes.EntityType.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, entityType=None,):
@@ -7444,7 +7444,7 @@ class createEntityType_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.entityType = apache.airavata.model.sharing.ttypes.EntityType()
+                    self.entityType = airavata.model.sharing.ttypes.EntityType()
                     self.entityType.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7492,8 +7492,8 @@ class createEntityType_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'dee', (apache.airavata.model.sharing.ttypes.DuplicateEntryException, apache.airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'dee', (airavata.model.sharing.ttypes.DuplicateEntryException, airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, success=None, sre=None, dee=None,):
@@ -7517,13 +7517,13 @@ class createEntityType_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.dee = apache.airavata.model.sharing.ttypes.DuplicateEntryException()
+                    self.dee = airavata.model.sharing.ttypes.DuplicateEntryException()
                     self.dee.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7575,7 +7575,7 @@ class updateEntityType_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'entityType', (apache.airavata.model.sharing.ttypes.EntityType, apache.airavata.model.sharing.ttypes.EntityType.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'entityType', (airavata.model.sharing.ttypes.EntityType, airavata.model.sharing.ttypes.EntityType.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, entityType=None,):
@@ -7592,7 +7592,7 @@ class updateEntityType_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.entityType = apache.airavata.model.sharing.ttypes.EntityType()
+                    self.entityType = airavata.model.sharing.ttypes.EntityType()
                     self.entityType.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7639,7 +7639,7 @@ class updateEntityType_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -7662,7 +7662,7 @@ class updateEntityType_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7787,7 +7787,7 @@ class isEntityTypeExists_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -7810,7 +7810,7 @@ class isEntityTypeExists_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -7935,7 +7935,7 @@ class deleteEntityType_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -7958,7 +7958,7 @@ class deleteEntityType_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8082,8 +8082,8 @@ class getEntityType_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.sharing.ttypes.EntityType, apache.airavata.model.sharing.ttypes.EntityType.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.STRUCT, 'success', (airavata.model.sharing.ttypes.EntityType, airavata.model.sharing.ttypes.EntityType.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -8101,13 +8101,13 @@ class getEntityType_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.sharing.ttypes.EntityType()
+                    self.success = airavata.model.sharing.ttypes.EntityType()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8245,8 +8245,8 @@ class getEntityTypes_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.EntityType, apache.airavata.model.sharing.ttypes.EntityType.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.EntityType, airavata.model.sharing.ttypes.EntityType.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -8267,7 +8267,7 @@ class getEntityTypes_result(object):
                     self.success = []
                     (_etype66, _size63) = iprot.readListBegin()
                     for _i67 in range(_size63):
-                        _elem68 = apache.airavata.model.sharing.ttypes.EntityType()
+                        _elem68 = airavata.model.sharing.ttypes.EntityType()
                         _elem68.read(iprot)
                         self.success.append(_elem68)
                     iprot.readListEnd()
@@ -8275,7 +8275,7 @@ class getEntityTypes_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8326,7 +8326,7 @@ class createEntity_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'entity', (apache.airavata.model.sharing.ttypes.Entity, apache.airavata.model.sharing.ttypes.Entity.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'entity', (airavata.model.sharing.ttypes.Entity, airavata.model.sharing.ttypes.Entity.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, entity=None,):
@@ -8343,7 +8343,7 @@ class createEntity_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.entity = apache.airavata.model.sharing.ttypes.Entity()
+                    self.entity = airavata.model.sharing.ttypes.Entity()
                     self.entity.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8390,7 +8390,7 @@ class createEntity_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -8413,7 +8413,7 @@ class createEntity_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8461,7 +8461,7 @@ class updateEntity_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'entity', (apache.airavata.model.sharing.ttypes.Entity, apache.airavata.model.sharing.ttypes.Entity.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'entity', (airavata.model.sharing.ttypes.Entity, airavata.model.sharing.ttypes.Entity.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, entity=None,):
@@ -8478,7 +8478,7 @@ class updateEntity_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.entity = apache.airavata.model.sharing.ttypes.Entity()
+                    self.entity = airavata.model.sharing.ttypes.Entity()
                     self.entity.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8525,7 +8525,7 @@ class updateEntity_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -8548,7 +8548,7 @@ class updateEntity_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8673,7 +8673,7 @@ class isEntityExists_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -8696,7 +8696,7 @@ class isEntityExists_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8821,7 +8821,7 @@ class deleteEntity_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -8844,7 +8844,7 @@ class deleteEntity_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -8968,8 +8968,8 @@ class getEntity_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.sharing.ttypes.Entity, apache.airavata.model.sharing.ttypes.Entity.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.STRUCT, 'success', (airavata.model.sharing.ttypes.Entity, airavata.model.sharing.ttypes.Entity.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -8987,13 +8987,13 @@ class getEntity_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.sharing.ttypes.Entity()
+                    self.success = airavata.model.sharing.ttypes.Entity()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9047,7 +9047,7 @@ class searchEntities_args(object):
         None,  # 0
         (1, TType.STRING, 'domainId', 'UTF8', None, ),  # 1
         (2, TType.STRING, 'userId', 'UTF8', None, ),  # 2
-        (3, TType.LIST, 'filters', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.SearchCriteria, apache.airavata.model.sharing.ttypes.SearchCriteria.thrift_spec), False), None, ),  # 3
+        (3, TType.LIST, 'filters', (TType.STRUCT, (airavata.model.sharing.ttypes.SearchCriteria, airavata.model.sharing.ttypes.SearchCriteria.thrift_spec), False), None, ),  # 3
         (4, TType.I32, 'offset', None, None, ),  # 4
         (5, TType.I32, 'limit', None, None, ),  # 5
     )
@@ -9083,7 +9083,7 @@ class searchEntities_args(object):
                     self.filters = []
                     (_etype73, _size70) = iprot.readListBegin()
                     for _i74 in range(_size70):
-                        _elem75 = apache.airavata.model.sharing.ttypes.SearchCriteria()
+                        _elem75 = airavata.model.sharing.ttypes.SearchCriteria()
                         _elem75.read(iprot)
                         self.filters.append(_elem75)
                     iprot.readListEnd()
@@ -9168,8 +9168,8 @@ class searchEntities_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.Entity, apache.airavata.model.sharing.ttypes.Entity.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.Entity, airavata.model.sharing.ttypes.Entity.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -9190,7 +9190,7 @@ class searchEntities_result(object):
                     self.success = []
                     (_etype80, _size77) = iprot.readListBegin()
                     for _i81 in range(_size77):
-                        _elem82 = apache.airavata.model.sharing.ttypes.Entity()
+                        _elem82 = airavata.model.sharing.ttypes.Entity()
                         _elem82.read(iprot)
                         self.success.append(_elem82)
                     iprot.readListEnd()
@@ -9198,7 +9198,7 @@ class searchEntities_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9339,8 +9339,8 @@ class getListOfSharedUsers_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.User, apache.airavata.model.sharing.ttypes.User.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.User, airavata.model.sharing.ttypes.User.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -9361,7 +9361,7 @@ class getListOfSharedUsers_result(object):
                     self.success = []
                     (_etype87, _size84) = iprot.readListBegin()
                     for _i88 in range(_size84):
-                        _elem89 = apache.airavata.model.sharing.ttypes.User()
+                        _elem89 = airavata.model.sharing.ttypes.User()
                         _elem89.read(iprot)
                         self.success.append(_elem89)
                     iprot.readListEnd()
@@ -9369,7 +9369,7 @@ class getListOfSharedUsers_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9510,8 +9510,8 @@ class getListOfSharedGroups_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.UserGroup, apache.airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.UserGroup, airavata.model.sharing.ttypes.UserGroup.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -9532,7 +9532,7 @@ class getListOfSharedGroups_result(object):
                     self.success = []
                     (_etype94, _size91) = iprot.readListBegin()
                     for _i95 in range(_size91):
-                        _elem96 = apache.airavata.model.sharing.ttypes.UserGroup()
+                        _elem96 = airavata.model.sharing.ttypes.UserGroup()
                         _elem96.read(iprot)
                         self.success.append(_elem96)
                     iprot.readListEnd()
@@ -9540,7 +9540,7 @@ class getListOfSharedGroups_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9591,7 +9591,7 @@ class createPermissionType_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'permissionType', (apache.airavata.model.sharing.ttypes.PermissionType, apache.airavata.model.sharing.ttypes.PermissionType.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'permissionType', (airavata.model.sharing.ttypes.PermissionType, airavata.model.sharing.ttypes.PermissionType.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, permissionType=None,):
@@ -9608,7 +9608,7 @@ class createPermissionType_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.permissionType = apache.airavata.model.sharing.ttypes.PermissionType()
+                    self.permissionType = airavata.model.sharing.ttypes.PermissionType()
                     self.permissionType.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9656,8 +9656,8 @@ class createPermissionType_result(object):
 
     thrift_spec = (
         (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'dee', (apache.airavata.model.sharing.ttypes.DuplicateEntryException, apache.airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (2, TType.STRUCT, 'dee', (airavata.model.sharing.ttypes.DuplicateEntryException, airavata.model.sharing.ttypes.DuplicateEntryException.thrift_spec), None, ),  # 2
     )
 
     def __init__(self, success=None, sre=None, dee=None,):
@@ -9681,13 +9681,13 @@ class createPermissionType_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 2:
                 if ftype == TType.STRUCT:
-                    self.dee = apache.airavata.model.sharing.ttypes.DuplicateEntryException()
+                    self.dee = airavata.model.sharing.ttypes.DuplicateEntryException()
                     self.dee.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9739,7 +9739,7 @@ class updatePermissionType_args(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.STRUCT, 'permissionType', (apache.airavata.model.sharing.ttypes.PermissionType, apache.airavata.model.sharing.ttypes.PermissionType.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'permissionType', (airavata.model.sharing.ttypes.PermissionType, airavata.model.sharing.ttypes.PermissionType.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, permissionType=None,):
@@ -9756,7 +9756,7 @@ class updatePermissionType_args(object):
                 break
             if fid == 1:
                 if ftype == TType.STRUCT:
-                    self.permissionType = apache.airavata.model.sharing.ttypes.PermissionType()
+                    self.permissionType = airavata.model.sharing.ttypes.PermissionType()
                     self.permissionType.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9803,7 +9803,7 @@ class updatePermissionType_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -9826,7 +9826,7 @@ class updatePermissionType_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -9951,7 +9951,7 @@ class isPermissionExists_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -9974,7 +9974,7 @@ class isPermissionExists_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -10099,7 +10099,7 @@ class deletePermissionType_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -10122,7 +10122,7 @@ class deletePermissionType_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -10246,8 +10246,8 @@ class getPermissionType_result(object):
     """
 
     thrift_spec = (
-        (0, TType.STRUCT, 'success', (apache.airavata.model.sharing.ttypes.PermissionType, apache.airavata.model.sharing.ttypes.PermissionType.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.STRUCT, 'success', (airavata.model.sharing.ttypes.PermissionType, airavata.model.sharing.ttypes.PermissionType.thrift_spec), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -10265,13 +10265,13 @@ class getPermissionType_result(object):
                 break
             if fid == 0:
                 if ftype == TType.STRUCT:
-                    self.success = apache.airavata.model.sharing.ttypes.PermissionType()
+                    self.success = airavata.model.sharing.ttypes.PermissionType()
                     self.success.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -10409,8 +10409,8 @@ class getPermissionTypes_result(object):
     """
 
     thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (apache.airavata.model.sharing.ttypes.PermissionType, apache.airavata.model.sharing.ttypes.PermissionType.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (0, TType.LIST, 'success', (TType.STRUCT, (airavata.model.sharing.ttypes.PermissionType, airavata.model.sharing.ttypes.PermissionType.thrift_spec), False), None, ),  # 0
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -10431,7 +10431,7 @@ class getPermissionTypes_result(object):
                     self.success = []
                     (_etype101, _size98) = iprot.readListBegin()
                     for _i102 in range(_size98):
-                        _elem103 = apache.airavata.model.sharing.ttypes.PermissionType()
+                        _elem103 = airavata.model.sharing.ttypes.PermissionType()
                         _elem103.read(iprot)
                         self.success.append(_elem103)
                     iprot.readListEnd()
@@ -10439,7 +10439,7 @@ class getPermissionTypes_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -10617,7 +10617,7 @@ class shareEntityWithUsers_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -10640,7 +10640,7 @@ class shareEntityWithUsers_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -10801,7 +10801,7 @@ class revokeEntitySharingFromUsers_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -10824,7 +10824,7 @@ class revokeEntitySharingFromUsers_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -10999,7 +10999,7 @@ class shareEntityWithGroups_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -11022,7 +11022,7 @@ class shareEntityWithGroups_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -11183,7 +11183,7 @@ class revokeEntitySharingFromGroups_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -11206,7 +11206,7 @@ class revokeEntitySharingFromGroups_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -11359,7 +11359,7 @@ class userHasAccess_result(object):
 
     thrift_spec = (
         (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'sre', (apache.airavata.model.sharing.ttypes.SharingRegistryException, apache.airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
+        (1, TType.STRUCT, 'sre', (airavata.model.sharing.ttypes.SharingRegistryException, airavata.model.sharing.ttypes.SharingRegistryException.thrift_spec), None, ),  # 1
     )
 
     def __init__(self, success=None, sre=None,):
@@ -11382,7 +11382,7 @@ class userHasAccess_result(object):
                     iprot.skip(ftype)
             elif fid == 1:
                 if ftype == TType.STRUCT:
-                    self.sre = apache.airavata.model.sharing.ttypes.SharingRegistryException()
+                    self.sre = airavata.model.sharing.ttypes.SharingRegistryException()
                     self.sre.read(iprot)
                 else:
                     iprot.skip(ftype)
diff --git a/apache/airavata/api/sharing/__init__.py b/airavata/api/sharing/__init__.py
similarity index 100%
rename from apache/airavata/api/sharing/__init__.py
rename to airavata/api/sharing/__init__.py
diff --git a/apache/airavata/model/workflow/constants.py b/airavata/api/sharing/constants.py
similarity index 100%
rename from apache/airavata/model/workflow/constants.py
rename to airavata/api/sharing/constants.py
diff --git a/apache/airavata/api/sharing/ttypes.py b/airavata/api/sharing/ttypes.py
similarity index 88%
rename from apache/airavata/api/sharing/ttypes.py
rename to airavata/api/sharing/ttypes.py
index 3a24bad..15b3eb3 100644
--- a/apache/airavata/api/sharing/ttypes.py
+++ b/airavata/api/sharing/ttypes.py
@@ -9,6 +9,6 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.sharing.ttypes
+import airavata.model.sharing.ttypes
 
 from thrift.transport import TTransport
diff --git a/airavata/api/ttypes.py b/airavata/api/ttypes.py
new file mode 100644
index 0000000..b7fe195
--- /dev/null
+++ b/airavata/api/ttypes.py
@@ -0,0 +1,35 @@
+#
+# Autogenerated by Thrift Compiler (0.10.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+import sys
+import airavata.api.error.ttypes
+import airavata.model.security.ttypes
+import airavata.model.ttypes
+import airavata.model.credential.store.ttypes
+import airavata.model.status.ttypes
+import airavata.model.job.ttypes
+import airavata.model.experiment.ttypes
+import airavata.model.workspace.ttypes
+import airavata.model.scheduling.ttypes
+import airavata.model.application.io.ttypes
+import airavata.model.appcatalog.appdeployment.ttypes
+import airavata.model.appcatalog.appinterface.ttypes
+import airavata.model.appcatalog.accountprovisioning.ttypes
+import airavata.model.appcatalog.computeresource.ttypes
+import airavata.model.appcatalog.storageresource.ttypes
+import airavata.model.appcatalog.gatewayprofile.ttypes
+import airavata.model.appcatalog.userresourceprofile.ttypes
+import airavata.model.data.movement.ttypes
+import airavata.model.workflow.ttypes
+import airavata.model.data.replica.ttypes
+import airavata.model.group.ttypes
+import airavata.model.user.ttypes
+
+from thrift.transport import TTransport
diff --git a/apache/airavata/model/workspace/__init__.py b/airavata/model/__init__.py
similarity index 100%
rename from apache/airavata/model/workspace/__init__.py
rename to airavata/model/__init__.py
diff --git a/apache/airavata/model/data/__init__.py b/airavata/model/appcatalog/__init__.py
similarity index 100%
rename from apache/airavata/model/data/__init__.py
rename to airavata/model/appcatalog/__init__.py
diff --git a/apache/airavata/model/workflow/__init__.py b/airavata/model/appcatalog/accountprovisioning/__init__.py
similarity index 100%
rename from apache/airavata/model/workflow/__init__.py
rename to airavata/model/appcatalog/accountprovisioning/__init__.py
diff --git a/apache/airavata/model/tenant/constants.py b/airavata/model/appcatalog/accountprovisioning/constants.py
similarity index 100%
rename from apache/airavata/model/tenant/constants.py
rename to airavata/model/appcatalog/accountprovisioning/constants.py
diff --git a/airavata/model/appcatalog/accountprovisioning/ttypes.py b/airavata/model/appcatalog/accountprovisioning/ttypes.py
new file mode 100644
index 0000000..8d3e95b
--- /dev/null
+++ b/airavata/model/appcatalog/accountprovisioning/ttypes.py
@@ -0,0 +1,243 @@
+#
+# Autogenerated by Thrift Compiler (0.10.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+import sys
+
+from thrift.transport import TTransport
+
+
+class SSHAccountProvisionerConfigParamType(object):
+    STRING = 0
+    CRED_STORE_PASSWORD_TOKEN = 1
+
+    _VALUES_TO_NAMES = {
+        0: "STRING",
+        1: "CRED_STORE_PASSWORD_TOKEN",
+    }
+
+    _NAMES_TO_VALUES = {
+        "STRING": 0,
+        "CRED_STORE_PASSWORD_TOKEN": 1,
+    }
+
+
+class SSHAccountProvisionerConfigParam(object):
+    """
+    Attributes:
+     - name
+     - type
+     - isOptional
+     - description
+    """
+
+    thrift_spec = (
+        None,  # 0
+        (1, TType.STRING, 'name', 'UTF8', None, ),  # 1
+        (2, TType.I32, 'type', None, 0, ),  # 2
+        (3, TType.BOOL, 'isOptional', None, False, ),  # 3
+        (4, TType.STRING, 'description', 'UTF8', None, ),  # 4
+    )
+
+    def __init__(self, name=None, type=thrift_spec[2][4], isOptional=thrift_spec[3][4], description=None,):
+        self.name = name
+        self.type = type
+        self.isOptional = isOptional
+        self.description = description
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.I32:
+                    self.type = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.BOOL:
+                    self.isOptional = iprot.readBool()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.description = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('SSHAccountProvisionerConfigParam')
+        if self.name is not None:
+            oprot.writeFieldBegin('name', TType.STRING, 1)
+            oprot.writeString(self.name.encode('utf-8') if sys.version_info[0] == 2 else self.name)
+            oprot.writeFieldEnd()
+        if self.type is not None:
+            oprot.writeFieldBegin('type', TType.I32, 2)
+            oprot.writeI32(self.type)
+            oprot.writeFieldEnd()
+        if self.isOptional is not None:
+            oprot.writeFieldBegin('isOptional', TType.BOOL, 3)
+            oprot.writeBool(self.isOptional)
+            oprot.writeFieldEnd()
+        if self.description is not None:
+            oprot.writeFieldBegin('description', TType.STRING, 4)
+            oprot.writeString(self.description.encode('utf-8') if sys.version_info[0] == 2 else self.description)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        if self.name is None:
+            raise TProtocolException(message='Required field name is unset!')
+        if self.type is None:
+            raise TProtocolException(message='Required field type is unset!')
+        if self.isOptional is None:
+            raise TProtocolException(message='Required field isOptional is unset!')
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class SSHAccountProvisioner(object):
+    """
+    Attributes:
+     - name
+     - canCreateAccount
+     - canInstallSSHKey
+     - configParams
+    """
+
+    thrift_spec = (
+        None,  # 0
+        (1, TType.STRING, 'name', 'UTF8', None, ),  # 1
+        (2, TType.BOOL, 'canCreateAccount', None, None, ),  # 2
+        (3, TType.BOOL, 'canInstallSSHKey', None, None, ),  # 3
+        (4, TType.LIST, 'configParams', (TType.STRUCT, (SSHAccountProvisionerConfigParam, SSHAccountProvisionerConfigParam.thrift_spec), False), None, ),  # 4
+    )
+
+    def __init__(self, name=None, canCreateAccount=None, canInstallSSHKey=None, configParams=None,):
+        self.name = name
+        self.canCreateAccount = canCreateAccount
+        self.canInstallSSHKey = canInstallSSHKey
+        self.configParams = configParams
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.BOOL:
+                    self.canCreateAccount = iprot.readBool()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.BOOL:
+                    self.canInstallSSHKey = iprot.readBool()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.LIST:
+                    self.configParams = []
+                    (_etype3, _size0) = iprot.readListBegin()
+                    for _i4 in range(_size0):
+                        _elem5 = SSHAccountProvisionerConfigParam()
+                        _elem5.read(iprot)
+                        self.configParams.append(_elem5)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            return
+        oprot.writeStructBegin('SSHAccountProvisioner')
+        if self.name is not None:
+            oprot.writeFieldBegin('name', TType.STRING, 1)
+            oprot.writeString(self.name.encode('utf-8') if sys.version_info[0] == 2 else self.name)
+            oprot.writeFieldEnd()
+        if self.canCreateAccount is not None:
+            oprot.writeFieldBegin('canCreateAccount', TType.BOOL, 2)
+            oprot.writeBool(self.canCreateAccount)
+            oprot.writeFieldEnd()
+        if self.canInstallSSHKey is not None:
+            oprot.writeFieldBegin('canInstallSSHKey', TType.BOOL, 3)
+            oprot.writeBool(self.canInstallSSHKey)
+            oprot.writeFieldEnd()
+        if self.configParams is not None:
+            oprot.writeFieldBegin('configParams', TType.LIST, 4)
+            oprot.writeListBegin(TType.STRUCT, len(self.configParams))
+            for iter6 in self.configParams:
+                iter6.write(oprot)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        if self.name is None:
+            raise TProtocolException(message='Required field name is unset!')
+        if self.canCreateAccount is None:
+            raise TProtocolException(message='Required field canCreateAccount is unset!')
+        if self.canInstallSSHKey is None:
+            raise TProtocolException(message='Required field canInstallSSHKey is unset!')
+        if self.configParams is None:
+            raise TProtocolException(message='Required field configParams is unset!')
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
diff --git a/apache/airavata/model/user/__init__.py b/airavata/model/appcatalog/appdeployment/__init__.py
similarity index 100%
rename from apache/airavata/model/user/__init__.py
rename to airavata/model/appcatalog/appdeployment/__init__.py
diff --git a/apache/airavata/model/task/constants.py b/airavata/model/appcatalog/appdeployment/constants.py
similarity index 100%
rename from apache/airavata/model/task/constants.py
rename to airavata/model/appcatalog/appdeployment/constants.py
diff --git a/apache/airavata/model/appcatalog/appdeployment/ttypes.py b/airavata/model/appcatalog/appdeployment/ttypes.py
similarity index 99%
rename from apache/airavata/model/appcatalog/appdeployment/ttypes.py
rename to airavata/model/appcatalog/appdeployment/ttypes.py
index 048f8f1..861f224 100644
--- a/apache/airavata/model/appcatalog/appdeployment/ttypes.py
+++ b/airavata/model/appcatalog/appdeployment/ttypes.py
@@ -9,8 +9,8 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
-import apache.airavata.model.appcatalog.parallelism.ttypes
+import airavata.model.commons.ttypes
+import airavata.model.appcatalog.parallelism.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/apache/airavata/model/tenant/__init__.py b/airavata/model/appcatalog/appinterface/__init__.py
similarity index 100%
rename from apache/airavata/model/tenant/__init__.py
rename to airavata/model/appcatalog/appinterface/__init__.py
diff --git a/apache/airavata/model/status/constants.py b/airavata/model/appcatalog/appinterface/constants.py
similarity index 100%
rename from apache/airavata/model/status/constants.py
rename to airavata/model/appcatalog/appinterface/constants.py
diff --git a/apache/airavata/model/appcatalog/appinterface/ttypes.py b/airavata/model/appcatalog/appinterface/ttypes.py
similarity index 92%
rename from apache/airavata/model/appcatalog/appinterface/ttypes.py
rename to airavata/model/appcatalog/appinterface/ttypes.py
index b7cfd58..acd9fd0 100644
--- a/apache/airavata/model/appcatalog/appinterface/ttypes.py
+++ b/airavata/model/appcatalog/appinterface/ttypes.py
@@ -9,8 +9,8 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.application.io.ttypes
-import apache.airavata.model.commons.ttypes
+import airavata.model.application.io.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
@@ -46,8 +46,8 @@ class ApplicationInterfaceDescription(object):
         (2, TType.STRING, 'applicationName', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'applicationDescription', 'UTF8', None, ),  # 3
         (4, TType.LIST, 'applicationModules', (TType.STRING, 'UTF8', False), None, ),  # 4
-        (5, TType.LIST, 'applicationInputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 5
-        (6, TType.LIST, 'applicationOutputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 6
+        (5, TType.LIST, 'applicationInputs', (TType.STRUCT, (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 5
+        (6, TType.LIST, 'applicationOutputs', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 6
         (7, TType.BOOL, 'archiveWorkingDirectory', None, False, ),  # 7
         (8, TType.BOOL, 'hasOptionalFileInputs', None, None, ),  # 8
     )
@@ -101,7 +101,7 @@ class ApplicationInterfaceDescription(object):
                     self.applicationInputs = []
                     (_etype9, _size6) = iprot.readListBegin()
                     for _i10 in range(_size6):
-                        _elem11 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+                        _elem11 = airavata.model.application.io.ttypes.InputDataObjectType()
                         _elem11.read(iprot)
                         self.applicationInputs.append(_elem11)
                     iprot.readListEnd()
@@ -112,7 +112,7 @@ class ApplicationInterfaceDescription(object):
                     self.applicationOutputs = []
                     (_etype15, _size12) = iprot.readListBegin()
                     for _i16 in range(_size12):
-                        _elem17 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem17 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem17.read(iprot)
                         self.applicationOutputs.append(_elem17)
                     iprot.readListEnd()
diff --git a/apache/airavata/model/task/__init__.py b/airavata/model/appcatalog/computeresource/__init__.py
similarity index 100%
rename from apache/airavata/model/task/__init__.py
rename to airavata/model/appcatalog/computeresource/__init__.py
diff --git a/apache/airavata/model/security/constants.py b/airavata/model/appcatalog/computeresource/constants.py
similarity index 100%
rename from apache/airavata/model/security/constants.py
rename to airavata/model/appcatalog/computeresource/constants.py
diff --git a/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata/model/appcatalog/computeresource/ttypes.py
similarity index 99%
rename from apache/airavata/model/appcatalog/computeresource/ttypes.py
rename to airavata/model/appcatalog/computeresource/ttypes.py
index cb5e083..5ba9ef4 100644
--- a/apache/airavata/model/appcatalog/computeresource/ttypes.py
+++ b/airavata/model/appcatalog/computeresource/ttypes.py
@@ -9,9 +9,9 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
-import apache.airavata.model.appcatalog.parallelism.ttypes
-import apache.airavata.model.data.movement.ttypes
+import airavata.model.commons.ttypes
+import airavata.model.appcatalog.parallelism.ttypes
+import airavata.model.data.movement.ttypes
 
 from thrift.transport import TTransport
 
@@ -1400,7 +1400,7 @@ class ComputeResourceDescription(object):
         (7, TType.LIST, 'batchQueues', (TType.STRUCT, (BatchQueue, BatchQueue.thrift_spec), False), None, ),  # 7
         (8, TType.MAP, 'fileSystems', (TType.I32, None, TType.STRING, 'UTF8', False), None, ),  # 8
         (9, TType.LIST, 'jobSubmissionInterfaces', (TType.STRUCT, (JobSubmissionInterface, JobSubmissionInterface.thrift_spec), False), None, ),  # 9
-        (10, TType.LIST, 'dataMovementInterfaces', (TType.STRUCT, (apache.airavata.model.data.movement.ttypes.DataMovementInterface, apache.airavata.model.data.movement.ttypes.DataMovementInterface.thrift_spec), False), None, ),  # 10
+        (10, TType.LIST, 'dataMovementInterfaces', (TType.STRUCT, (airavata.model.data.movement.ttypes.DataMovementInterface, airavata.model.data.movement.ttypes.DataMovementInterface.thrift_spec), False), None, ),  # 10
         (11, TType.I32, 'maxMemoryPerNode', None, None, ),  # 11
         (12, TType.BOOL, 'gatewayUsageReporting', None, None, ),  # 12
         (13, TType.STRING, 'gatewayUsageModuleLoadCommand', 'UTF8', None, ),  # 13
@@ -1518,7 +1518,7 @@ class ComputeResourceDescription(object):
                     self.dataMovementInterfaces = []
                     (_etype66, _size63) = iprot.readListBegin()
                     for _i67 in range(_size63):
-                        _elem68 = apache.airavata.model.data.movement.ttypes.DataMovementInterface()
+                        _elem68 = airavata.model.data.movement.ttypes.DataMovementInterface()
                         _elem68.read(iprot)
                         self.dataMovementInterfaces.append(_elem68)
                     iprot.readListEnd()
diff --git a/apache/airavata/model/status/__init__.py b/airavata/model/appcatalog/gatewayprofile/__init__.py
similarity index 100%
rename from apache/airavata/model/status/__init__.py
rename to airavata/model/appcatalog/gatewayprofile/__init__.py
diff --git a/apache/airavata/model/scheduling/constants.py b/airavata/model/appcatalog/gatewayprofile/constants.py
similarity index 100%
rename from apache/airavata/model/scheduling/constants.py
rename to airavata/model/appcatalog/gatewayprofile/constants.py
diff --git a/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py b/airavata/model/appcatalog/gatewayprofile/ttypes.py
similarity index 85%
rename from apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
rename to airavata/model/appcatalog/gatewayprofile/ttypes.py
index 7e7d4dc..6908a39 100644
--- a/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
+++ b/airavata/model/appcatalog/gatewayprofile/ttypes.py
@@ -9,8 +9,9 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.appcatalog.computeresource.ttypes
-import apache.airavata.model.data.movement.ttypes
+import airavata.model.appcatalog.computeresource.ttypes
+import airavata.model.data.movement.ttypes
+import airavata.model.appcatalog.accountprovisioning.ttypes
 
 from thrift.transport import TTransport
 
@@ -65,6 +66,9 @@ class ComputeResourcePreference(object):
      - reservation
      - reservationStartTime
      - reservationEndTime
+     - sshAccountProvisioner
+     - sshAccountProvisionerConfig
+     - sshAccountProvisionerAdditionalInfo
     """
 
     thrift_spec = (
@@ -83,9 +87,12 @@ class ComputeResourcePreference(object):
         (12, TType.STRING, 'reservation', 'UTF8', None, ),  # 12
         (13, TType.I64, 'reservationStartTime', None, None, ),  # 13
         (14, TType.I64, 'reservationEndTime', None, None, ),  # 14
+        (15, TType.STRING, 'sshAccountProvisioner', 'UTF8', None, ),  # 15
+        (16, TType.MAP, 'sshAccountProvisionerConfig', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 16
+        (17, TType.STRING, 'sshAccountProvisionerAdditionalInfo', 'UTF8', None, ),  # 17
     )
 
-    def __init__(self, computeResourceId=None, overridebyAiravata=thrift_spec[2][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, usageReportingGatewayId=None, qualityOfService=None, reservation=None, reservationStartTime=None, reservationEndTime=None,):
+    def __init__(self, computeResourceId=None, overridebyAiravata=thrift_spec[2][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, usageReportingGatewayId=None, qualityOfService=None, reservation=None, reservationStartTime=None, reservationEndTime=None, sshAccountProvisioner=None, sshAccountProvisionerConfig=None, sshAccou [...]
         self.computeResourceId = computeResourceId
         self.overridebyAiravata = overridebyAiravata
         self.loginUserName = loginUserName
@@ -100,6 +107,9 @@ class ComputeResourcePreference(object):
         self.reservation = reservation
         self.reservationStartTime = reservationStartTime
         self.reservationEndTime = reservationEndTime
+        self.sshAccountProvisioner = sshAccountProvisioner
+        self.sshAccountProvisionerConfig = sshAccountProvisionerConfig
+        self.sshAccountProvisionerAdditionalInfo = sshAccountProvisionerAdditionalInfo
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -180,6 +190,27 @@ class ComputeResourcePreference(object):
                     self.reservationEndTime = iprot.readI64()
                 else:
                     iprot.skip(ftype)
+            elif fid == 15:
+                if ftype == TType.STRING:
+                    self.sshAccountProvisioner = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 16:
+                if ftype == TType.MAP:
+                    self.sshAccountProvisionerConfig = {}
+                    (_ktype1, _vtype2, _size0) = iprot.readMapBegin()
+                    for _i4 in range(_size0):
+                        _key5 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        _val6 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                        self.sshAccountProvisionerConfig[_key5] = _val6
+                    iprot.readMapEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 17:
+                if ftype == TType.STRING:
+                    self.sshAccountProvisionerAdditionalInfo = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -246,6 +277,22 @@ class ComputeResourcePreference(object):
             oprot.writeFieldBegin('reservationEndTime', TType.I64, 14)
             oprot.writeI64(self.reservationEndTime)
             oprot.writeFieldEnd()
+        if self.sshAccountProvisioner is not None:
+            oprot.writeFieldBegin('sshAccountProvisioner', TType.STRING, 15)
+            oprot.writeString(self.sshAccountProvisioner.encode('utf-8') if sys.version_info[0] == 2 else self.sshAccountProvisioner)
+            oprot.writeFieldEnd()
+        if self.sshAccountProvisionerConfig is not None:
+            oprot.writeFieldBegin('sshAccountProvisionerConfig', TType.MAP, 16)
+            oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.sshAccountProvisionerConfig))
+            for kiter7, viter8 in self.sshAccountProvisionerConfig.items():
+                oprot.writeString(kiter7.encode('utf-8') if sys.version_info[0] == 2 else kiter7)
+                oprot.writeString(viter8.encode('utf-8') if sys.version_info[0] == 2 else viter8)
+            oprot.writeMapEnd()
+            oprot.writeFieldEnd()
+        if self.sshAccountProvisionerAdditionalInfo is not None:
+            oprot.writeFieldBegin('sshAccountProvisionerAdditionalInfo', TType.STRING, 17)
+            oprot.writeString(self.sshAccountProvisionerAdditionalInfo.encode('utf-8') if sys.version_info[0] == 2 else self.sshAccountProvisionerAdditionalInfo)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -433,22 +480,22 @@ class GatewayResourceProfile(object):
             elif fid == 3:
                 if ftype == TType.LIST:
                     self.computeResourcePreferences = []
-                    (_etype3, _size0) = iprot.readListBegin()
-                    for _i4 in range(_size0):
-                        _elem5 = ComputeResourcePreference()
-                        _elem5.read(iprot)
-                        self.computeResourcePreferences.append(_elem5)
+                    (_etype12, _size9) = iprot.readListBegin()
+                    for _i13 in range(_size9):
+                        _elem14 = ComputeResourcePreference()
+                        _elem14.read(iprot)
+                        self.computeResourcePreferences.append(_elem14)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.LIST:
                     self.storagePreferences = []
-                    (_etype9, _size6) = iprot.readListBegin()
-                    for _i10 in range(_size6):
-                        _elem11 = StoragePreference()
-                        _elem11.read(iprot)
-                        self.storagePreferences.append(_elem11)
+                    (_etype18, _size15) = iprot.readListBegin()
+                    for _i19 in range(_size15):
+                        _elem20 = StoragePreference()
+                        _elem20.read(iprot)
+                        self.storagePreferences.append(_elem20)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -483,15 +530,15 @@ class GatewayResourceProfile(object):
         if self.computeResourcePreferences is not None:
             oprot.writeFieldBegin('computeResourcePreferences', TType.LIST, 3)
             oprot.writeListBegin(TType.STRUCT, len(self.computeResourcePreferences))
-            for iter12 in self.computeResourcePreferences:
-                iter12.write(oprot)
+            for iter21 in self.computeResourcePreferences:
+                iter21.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.storagePreferences is not None:
             oprot.writeFieldBegin('storagePreferences', TType.LIST, 4)
             oprot.writeListBegin(TType.STRUCT, len(self.storagePreferences))
-            for iter13 in self.storagePreferences:
-                iter13.write(oprot)
+            for iter22 in self.storagePreferences:
+                iter22.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         if self.identityServerTenant is not None:
diff --git a/apache/airavata/model/sharing/__init__.py b/airavata/model/appcatalog/parallelism/__init__.py
similarity index 100%
rename from apache/airavata/model/sharing/__init__.py
rename to airavata/model/appcatalog/parallelism/__init__.py
diff --git a/apache/airavata/model/process/constants.py b/airavata/model/appcatalog/parallelism/constants.py
similarity index 100%
rename from apache/airavata/model/process/constants.py
rename to airavata/model/appcatalog/parallelism/constants.py
diff --git a/apache/airavata/model/appcatalog/parallelism/ttypes.py b/airavata/model/appcatalog/parallelism/ttypes.py
similarity index 100%
rename from apache/airavata/model/appcatalog/parallelism/ttypes.py
rename to airavata/model/appcatalog/parallelism/ttypes.py
diff --git a/apache/airavata/model/security/__init__.py b/airavata/model/appcatalog/storageresource/__init__.py
similarity index 100%
rename from apache/airavata/model/security/__init__.py
rename to airavata/model/appcatalog/storageresource/__init__.py
diff --git a/apache/airavata/model/messaging/event/constants.py b/airavata/model/appcatalog/storageresource/constants.py
similarity index 100%
rename from apache/airavata/model/messaging/event/constants.py
rename to airavata/model/appcatalog/storageresource/constants.py
diff --git a/apache/airavata/model/appcatalog/storageresource/ttypes.py b/airavata/model/appcatalog/storageresource/ttypes.py
similarity index 94%
rename from apache/airavata/model/appcatalog/storageresource/ttypes.py
rename to airavata/model/appcatalog/storageresource/ttypes.py
index a33b14a..e1ebd1c 100644
--- a/apache/airavata/model/appcatalog/storageresource/ttypes.py
+++ b/airavata/model/appcatalog/storageresource/ttypes.py
@@ -9,8 +9,8 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
-import apache.airavata.model.data.movement.ttypes
+import airavata.model.commons.ttypes
+import airavata.model.data.movement.ttypes
 
 from thrift.transport import TTransport
 
@@ -47,7 +47,7 @@ class StorageResourceDescription(object):
         (2, TType.STRING, 'hostName', 'UTF8', None, ),  # 2
         (3, TType.STRING, 'storageResourceDescription', 'UTF8', None, ),  # 3
         (4, TType.BOOL, 'enabled', None, None, ),  # 4
-        (5, TType.LIST, 'dataMovementInterfaces', (TType.STRUCT, (apache.airavata.model.data.movement.ttypes.DataMovementInterface, apache.airavata.model.data.movement.ttypes.DataMovementInterface.thrift_spec), False), None, ),  # 5
+        (5, TType.LIST, 'dataMovementInterfaces', (TType.STRUCT, (airavata.model.data.movement.ttypes.DataMovementInterface, airavata.model.data.movement.ttypes.DataMovementInterface.thrift_spec), False), None, ),  # 5
     )
 
     def __init__(self, storageResourceId=thrift_spec[1][4], hostName=None, storageResourceDescription=None, enabled=None, dataMovementInterfaces=None,):
@@ -91,7 +91,7 @@ class StorageResourceDescription(object):
                     self.dataMovementInterfaces = []
                     (_etype3, _size0) = iprot.readListBegin()
                     for _i4 in range(_size0):
-                        _elem5 = apache.airavata.model.data.movement.ttypes.DataMovementInterface()
+                        _elem5 = airavata.model.data.movement.ttypes.DataMovementInterface()
                         _elem5.read(iprot)
                         self.dataMovementInterfaces.append(_elem5)
                     iprot.readListEnd()
diff --git a/apache/airavata/model/scheduling/__init__.py b/airavata/model/appcatalog/userresourceprofile/__init__.py
similarity index 100%
rename from apache/airavata/model/scheduling/__init__.py
rename to airavata/model/appcatalog/userresourceprofile/__init__.py
diff --git a/apache/airavata/model/job/constants.py b/airavata/model/appcatalog/userresourceprofile/constants.py
similarity index 100%
rename from apache/airavata/model/job/constants.py
rename to airavata/model/appcatalog/userresourceprofile/constants.py
diff --git a/apache/airavata/model/appcatalog/userresourceprofile/ttypes.py b/airavata/model/appcatalog/userresourceprofile/ttypes.py
similarity index 95%
rename from apache/airavata/model/appcatalog/userresourceprofile/ttypes.py
rename to airavata/model/appcatalog/userresourceprofile/ttypes.py
index 1ce8736..efec47c 100644
--- a/apache/airavata/model/appcatalog/userresourceprofile/ttypes.py
+++ b/airavata/model/appcatalog/userresourceprofile/ttypes.py
@@ -9,9 +9,9 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.appcatalog.computeresource.ttypes
-import apache.airavata.model.data.movement.ttypes
-import apache.airavata.model.user.ttypes
+import airavata.model.appcatalog.computeresource.ttypes
+import airavata.model.data.movement.ttypes
+import airavata.model.user.ttypes
 
 from thrift.transport import TTransport
 
@@ -43,6 +43,11 @@ class UserComputeResourcePreference(object):
      Resource specific credential store token. If this token is specified, then it is superceeded by the gateway's
       default credential store.
 
+    validated:
+     If true the the configuration has been validated in the sense that the username and credential can be used to
+     login to the remote host and the scratchLocation is a valid location that the user has permission to write to.
+     Should be treated as read-only and only mutated by Airavata middleware.
+
 
     Attributes:
      - computeResourceId
@@ -55,6 +60,7 @@ class UserComputeResourcePreference(object):
      - reservation
      - reservationStartTime
      - reservationEndTime
+     - validated
     """
 
     thrift_spec = (
@@ -69,9 +75,10 @@ class UserComputeResourcePreference(object):
         (8, TType.STRING, 'reservation', 'UTF8', None, ),  # 8
         (9, TType.I64, 'reservationStartTime', None, None, ),  # 9
         (10, TType.I64, 'reservationEndTime', None, None, ),  # 10
+        (11, TType.BOOL, 'validated', None, False, ),  # 11
     )
 
-    def __init__(self, computeResourceId=None, loginUserName=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, qualityOfService=None, reservation=None, reservationStartTime=None, reservationEndTime=None,):
+    def __init__(self, computeResourceId=None, loginUserName=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, qualityOfService=None, reservation=None, reservationStartTime=None, reservationEndTime=None, validated=thrift_spec[11][4],):
         self.computeResourceId = computeResourceId
         self.loginUserName = loginUserName
         self.preferredBatchQueue = preferredBatchQueue
@@ -82,6 +89,7 @@ class UserComputeResourcePreference(object):
         self.reservation = reservation
         self.reservationStartTime = reservationStartTime
         self.reservationEndTime = reservationEndTime
+        self.validated = validated
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -142,6 +150,11 @@ class UserComputeResourcePreference(object):
                     self.reservationEndTime = iprot.readI64()
                 else:
                     iprot.skip(ftype)
+            elif fid == 11:
+                if ftype == TType.BOOL:
+                    self.validated = iprot.readBool()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -192,6 +205,10 @@ class UserComputeResourcePreference(object):
             oprot.writeFieldBegin('reservationEndTime', TType.I64, 10)
             oprot.writeI64(self.reservationEndTime)
             oprot.writeFieldEnd()
+        if self.validated is not None:
+            oprot.writeFieldBegin('validated', TType.BOOL, 11)
+            oprot.writeBool(self.validated)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
diff --git a/apache/airavata/model/application/__init__.py b/airavata/model/application/__init__.py
similarity index 100%
rename from apache/airavata/model/application/__init__.py
rename to airavata/model/application/__init__.py
diff --git a/apache/airavata/model/process/__init__.py b/airavata/model/application/io/__init__.py
similarity index 100%
rename from apache/airavata/model/process/__init__.py
rename to airavata/model/application/io/__init__.py
diff --git a/apache/airavata/model/group/constants.py b/airavata/model/application/io/constants.py
similarity index 100%
rename from apache/airavata/model/group/constants.py
rename to airavata/model/application/io/constants.py
diff --git a/apache/airavata/model/application/io/ttypes.py b/airavata/model/application/io/ttypes.py
similarity index 99%
rename from apache/airavata/model/application/io/ttypes.py
rename to airavata/model/application/io/ttypes.py
index da1e363..10e1d47 100644
--- a/apache/airavata/model/application/io/ttypes.py
+++ b/airavata/model/application/io/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.appcatalog.computeresource.ttypes
+import airavata.model.appcatalog.computeresource.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/apache/airavata/model/messaging/event/__init__.py b/airavata/model/commons/__init__.py
similarity index 100%
rename from apache/airavata/model/messaging/event/__init__.py
rename to airavata/model/commons/__init__.py
diff --git a/credential_store_data_models/constants.py b/airavata/model/commons/constants.py
similarity index 100%
rename from credential_store_data_models/constants.py
rename to airavata/model/commons/constants.py
diff --git a/apache/airavata/model/commons/ttypes.py b/airavata/model/commons/ttypes.py
similarity index 100%
rename from apache/airavata/model/commons/ttypes.py
rename to airavata/model/commons/ttypes.py
diff --git a/apache/airavata/model/experiment/constants.py b/airavata/model/constants.py
similarity index 100%
rename from apache/airavata/model/experiment/constants.py
rename to airavata/model/constants.py
diff --git a/apache/airavata/model/appcatalog/__init__.py b/airavata/model/credential/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/__init__.py
rename to airavata/model/credential/__init__.py
diff --git a/apache/airavata/model/job/__init__.py b/airavata/model/credential/store/__init__.py
similarity index 100%
rename from apache/airavata/model/job/__init__.py
rename to airavata/model/credential/store/__init__.py
diff --git a/apache/airavata/model/commons/constants.py b/airavata/model/credential/store/constants.py
similarity index 100%
rename from apache/airavata/model/commons/constants.py
rename to airavata/model/credential/store/constants.py
diff --git a/credential_store_data_models/ttypes.py b/airavata/model/credential/store/ttypes.py
similarity index 100%
rename from credential_store_data_models/ttypes.py
rename to airavata/model/credential/store/ttypes.py
diff --git a/apache/airavata/__init__.py b/airavata/model/data/__init__.py
similarity index 100%
rename from apache/airavata/__init__.py
rename to airavata/model/data/__init__.py
diff --git a/apache/airavata/model/group/__init__.py b/airavata/model/data/movement/__init__.py
similarity index 100%
rename from apache/airavata/model/group/__init__.py
rename to airavata/model/data/movement/__init__.py
diff --git a/apache/airavata/model/dbevent/constants.py b/airavata/model/data/movement/constants.py
similarity index 100%
rename from apache/airavata/model/dbevent/constants.py
rename to airavata/model/data/movement/constants.py
diff --git a/apache/airavata/model/data/movement/ttypes.py b/airavata/model/data/movement/ttypes.py
similarity index 99%
rename from apache/airavata/model/data/movement/ttypes.py
rename to airavata/model/data/movement/ttypes.py
index ff74381..c25eb43 100644
--- a/apache/airavata/model/data/movement/ttypes.py
+++ b/airavata/model/data/movement/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/apache/airavata/model/experiment/__init__.py b/airavata/model/data/replica/__init__.py
similarity index 100%
rename from apache/airavata/model/experiment/__init__.py
rename to airavata/model/data/replica/__init__.py
diff --git a/apache/airavata/model/data/replica/constants.py b/airavata/model/data/replica/constants.py
similarity index 100%
rename from apache/airavata/model/data/replica/constants.py
rename to airavata/model/data/replica/constants.py
diff --git a/apache/airavata/model/data/replica/ttypes.py b/airavata/model/data/replica/ttypes.py
similarity index 100%
rename from apache/airavata/model/data/replica/ttypes.py
rename to airavata/model/data/replica/ttypes.py
diff --git a/apache/airavata/model/dbevent/__init__.py b/airavata/model/dbevent/__init__.py
similarity index 100%
rename from apache/airavata/model/dbevent/__init__.py
rename to airavata/model/dbevent/__init__.py
diff --git a/apache/airavata/model/data/movement/constants.py b/airavata/model/dbevent/constants.py
similarity index 100%
rename from apache/airavata/model/data/movement/constants.py
rename to airavata/model/dbevent/constants.py
diff --git a/apache/airavata/model/dbevent/ttypes.py b/airavata/model/dbevent/ttypes.py
similarity index 100%
rename from apache/airavata/model/dbevent/ttypes.py
rename to airavata/model/dbevent/ttypes.py
diff --git a/apache/airavata/model/data/replica/__init__.py b/airavata/model/experiment/__init__.py
similarity index 100%
rename from apache/airavata/model/data/replica/__init__.py
rename to airavata/model/experiment/__init__.py
diff --git a/apache/airavata/model/constants.py b/airavata/model/experiment/constants.py
similarity index 100%
rename from apache/airavata/model/constants.py
rename to airavata/model/experiment/constants.py
diff --git a/apache/airavata/model/experiment/ttypes.py b/airavata/model/experiment/ttypes.py
similarity index 95%
rename from apache/airavata/model/experiment/ttypes.py
rename to airavata/model/experiment/ttypes.py
index e4e2e45..a1de658 100644
--- a/apache/airavata/model/experiment/ttypes.py
+++ b/airavata/model/experiment/ttypes.py
@@ -9,11 +9,11 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
-import apache.airavata.model.application.io.ttypes
-import apache.airavata.model.scheduling.ttypes
-import apache.airavata.model.status.ttypes
-import apache.airavata.model.process.ttypes
+import airavata.model.commons.ttypes
+import airavata.model.application.io.ttypes
+import airavata.model.scheduling.ttypes
+import airavata.model.status.ttypes
+import airavata.model.process.ttypes
 
 from thrift.transport import TTransport
 
@@ -102,7 +102,7 @@ class UserConfigurationDataModel(object):
         (1, TType.BOOL, 'airavataAutoSchedule', None, False, ),  # 1
         (2, TType.BOOL, 'overrideManualScheduledParams', None, False, ),  # 2
         (3, TType.BOOL, 'shareExperimentPublicly', None, False, ),  # 3
-        (4, TType.STRUCT, 'computationalResourceScheduling', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ),  # 4
+        (4, TType.STRUCT, 'computationalResourceScheduling', (airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ),  # 4
         (5, TType.BOOL, 'throttleResources', None, False, ),  # 5
         (6, TType.STRING, 'userDN', 'UTF8', None, ),  # 6
         (7, TType.BOOL, 'generateCert', None, False, ),  # 7
@@ -149,7 +149,7 @@ class UserConfigurationDataModel(object):
                     iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.STRUCT:
-                    self.computationalResourceScheduling = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
+                    self.computationalResourceScheduling = airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
                     self.computationalResourceScheduling.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -310,11 +310,11 @@ class ExperimentModel(object):
         (12, TType.BOOL, 'enableEmailNotification', None, None, ),  # 12
         (13, TType.LIST, 'emailAddresses', (TType.STRING, 'UTF8', False), None, ),  # 13
         (14, TType.STRUCT, 'userConfigurationData', (UserConfigurationDataModel, UserConfigurationDataModel.thrift_spec), None, ),  # 14
-        (15, TType.LIST, 'experimentInputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 15
-        (16, TType.LIST, 'experimentOutputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 16
-        (17, TType.LIST, 'experimentStatus', (TType.STRUCT, (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), False), None, ),  # 17
-        (18, TType.LIST, 'errors', (TType.STRUCT, (apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ),  # 18
-        (19, TType.LIST, 'processes', (TType.STRUCT, (apache.airavata.model.process.ttypes.ProcessModel, apache.airavata.model.process.ttypes.ProcessModel.thrift_spec), False), None, ),  # 19
+        (15, TType.LIST, 'experimentInputs', (TType.STRUCT, (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 15
+        (16, TType.LIST, 'experimentOutputs', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 16
+        (17, TType.LIST, 'experimentStatus', (TType.STRUCT, (airavata.model.status.ttypes.ExperimentStatus, airavata.model.status.ttypes.ExperimentStatus.thrift_spec), False), None, ),  # 17
+        (18, TType.LIST, 'errors', (TType.STRUCT, (airavata.model.commons.ttypes.ErrorModel, airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ),  # 18
+        (19, TType.LIST, 'processes', (TType.STRUCT, (airavata.model.process.ttypes.ProcessModel, airavata.model.process.ttypes.ProcessModel.thrift_spec), False), None, ),  # 19
     )
 
     def __init__(self, experimentId=thrift_spec[1][4], projectId=None, gatewayId=None, experimentType=thrift_spec[4][4], userName=None, experimentName=None, creationTime=None, description=None, executionId=None, gatewayExecutionId=None, gatewayInstanceId=None, enableEmailNotification=None, emailAddresses=None, userConfigurationData=None, experimentInputs=None, experimentOutputs=None, experimentStatus=None, errors=None, processes=None,):
@@ -428,7 +428,7 @@ class ExperimentModel(object):
                     self.experimentInputs = []
                     (_etype9, _size6) = iprot.readListBegin()
                     for _i10 in range(_size6):
-                        _elem11 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+                        _elem11 = airavata.model.application.io.ttypes.InputDataObjectType()
                         _elem11.read(iprot)
                         self.experimentInputs.append(_elem11)
                     iprot.readListEnd()
@@ -439,7 +439,7 @@ class ExperimentModel(object):
                     self.experimentOutputs = []
                     (_etype15, _size12) = iprot.readListBegin()
                     for _i16 in range(_size12):
-                        _elem17 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem17 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem17.read(iprot)
                         self.experimentOutputs.append(_elem17)
                     iprot.readListEnd()
@@ -450,7 +450,7 @@ class ExperimentModel(object):
                     self.experimentStatus = []
                     (_etype21, _size18) = iprot.readListBegin()
                     for _i22 in range(_size18):
-                        _elem23 = apache.airavata.model.status.ttypes.ExperimentStatus()
+                        _elem23 = airavata.model.status.ttypes.ExperimentStatus()
                         _elem23.read(iprot)
                         self.experimentStatus.append(_elem23)
                     iprot.readListEnd()
@@ -461,7 +461,7 @@ class ExperimentModel(object):
                     self.errors = []
                     (_etype27, _size24) = iprot.readListBegin()
                     for _i28 in range(_size24):
-                        _elem29 = apache.airavata.model.commons.ttypes.ErrorModel()
+                        _elem29 = airavata.model.commons.ttypes.ErrorModel()
                         _elem29.read(iprot)
                         self.errors.append(_elem29)
                     iprot.readListEnd()
@@ -472,7 +472,7 @@ class ExperimentModel(object):
                     self.processes = []
                     (_etype33, _size30) = iprot.readListBegin()
                     for _i34 in range(_size30):
-                        _elem35 = apache.airavata.model.process.ttypes.ProcessModel()
+                        _elem35 = airavata.model.process.ttypes.ProcessModel()
                         _elem35.read(iprot)
                         self.processes.append(_elem35)
                     iprot.readListEnd()
diff --git a/apache/airavata/model/data/movement/__init__.py b/airavata/model/group/__init__.py
similarity index 100%
rename from apache/airavata/model/data/movement/__init__.py
rename to airavata/model/group/__init__.py
diff --git a/apache/airavata/model/application/io/constants.py b/airavata/model/group/constants.py
similarity index 100%
rename from apache/airavata/model/application/io/constants.py
rename to airavata/model/group/constants.py
diff --git a/apache/airavata/model/group/ttypes.py b/airavata/model/group/ttypes.py
similarity index 99%
rename from apache/airavata/model/group/ttypes.py
rename to airavata/model/group/ttypes.py
index 17632e6..8219ad2 100644
--- a/apache/airavata/model/group/ttypes.py
+++ b/airavata/model/group/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/apache/airavata/model/commons/__init__.py b/airavata/model/job/__init__.py
similarity index 100%
rename from apache/airavata/model/commons/__init__.py
rename to airavata/model/job/__init__.py
diff --git a/apache/airavata/model/appcatalog/userresourceprofile/constants.py b/airavata/model/job/constants.py
similarity index 100%
rename from apache/airavata/model/appcatalog/userresourceprofile/constants.py
rename to airavata/model/job/constants.py
diff --git a/apache/airavata/model/job/ttypes.py b/airavata/model/job/ttypes.py
similarity index 96%
rename from apache/airavata/model/job/ttypes.py
rename to airavata/model/job/ttypes.py
index ed4e249..1e16680 100644
--- a/apache/airavata/model/job/ttypes.py
+++ b/airavata/model/job/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.status.ttypes
+import airavata.model.status.ttypes
 
 from thrift.transport import TTransport
 
@@ -38,7 +38,7 @@ class JobModel(object):
         (3, TType.STRING, 'processId', 'UTF8', None, ),  # 3
         (4, TType.STRING, 'jobDescription', 'UTF8', None, ),  # 4
         (5, TType.I64, 'creationTime', None, None, ),  # 5
-        (6, TType.LIST, 'jobStatuses', (TType.STRUCT, (apache.airavata.model.status.ttypes.JobStatus, apache.airavata.model.status.ttypes.JobStatus.thrift_spec), False), None, ),  # 6
+        (6, TType.LIST, 'jobStatuses', (TType.STRUCT, (airavata.model.status.ttypes.JobStatus, airavata.model.status.ttypes.JobStatus.thrift_spec), False), None, ),  # 6
         (7, TType.STRING, 'computeResourceConsumed', 'UTF8', None, ),  # 7
         (8, TType.STRING, 'jobName', 'UTF8', None, ),  # 8
         (9, TType.STRING, 'workingDir', 'UTF8', None, ),  # 9
@@ -100,7 +100,7 @@ class JobModel(object):
                     self.jobStatuses = []
                     (_etype3, _size0) = iprot.readListBegin()
                     for _i4 in range(_size0):
-                        _elem5 = apache.airavata.model.status.ttypes.JobStatus()
+                        _elem5 = airavata.model.status.ttypes.JobStatus()
                         _elem5.read(iprot)
                         self.jobStatuses.append(_elem5)
                     iprot.readListEnd()
diff --git a/apache/__init__.py b/airavata/model/messaging/__init__.py
similarity index 100%
rename from apache/__init__.py
rename to airavata/model/messaging/__init__.py
diff --git a/apache/airavata/model/application/io/__init__.py b/airavata/model/messaging/event/__init__.py
similarity index 100%
rename from apache/airavata/model/application/io/__init__.py
rename to airavata/model/messaging/event/__init__.py
diff --git a/apache/airavata/model/appcatalog/storageresource/constants.py b/airavata/model/messaging/event/constants.py
similarity index 100%
rename from apache/airavata/model/appcatalog/storageresource/constants.py
rename to airavata/model/messaging/event/constants.py
diff --git a/apache/airavata/model/messaging/event/ttypes.py b/airavata/model/messaging/event/ttypes.py
similarity index 99%
rename from apache/airavata/model/messaging/event/ttypes.py
rename to airavata/model/messaging/event/ttypes.py
index a5224ec..0d6dac6 100644
--- a/apache/airavata/model/messaging/event/ttypes.py
+++ b/airavata/model/messaging/event/ttypes.py
@@ -9,9 +9,9 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.status.ttypes
-import apache.airavata.model.application.io.ttypes
-import apache.airavata.model.commons.ttypes
+import airavata.model.status.ttypes
+import airavata.model.application.io.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
@@ -674,7 +674,7 @@ class TaskOutputChangeEvent(object):
 
     thrift_spec = (
         None,  # 0
-        (1, TType.LIST, 'output', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 1
+        (1, TType.LIST, 'output', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 1
         (2, TType.STRUCT, 'taskIdentity', (TaskIdentifier, TaskIdentifier.thrift_spec), None, ),  # 2
     )
 
@@ -696,7 +696,7 @@ class TaskOutputChangeEvent(object):
                     self.output = []
                     (_etype3, _size0) = iprot.readListBegin()
                     for _i4 in range(_size0):
-                        _elem5 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem5 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem5.read(iprot)
                         self.output.append(_elem5)
                     iprot.readListEnd()
diff --git a/apache/airavata/model/appcatalog/userresourceprofile/__init__.py b/airavata/model/process/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/userresourceprofile/__init__.py
rename to airavata/model/process/__init__.py
diff --git a/apache/airavata/model/appcatalog/parallelism/constants.py b/airavata/model/process/constants.py
similarity index 100%
rename from apache/airavata/model/appcatalog/parallelism/constants.py
rename to airavata/model/process/constants.py
diff --git a/apache/airavata/model/process/ttypes.py b/airavata/model/process/ttypes.py
similarity index 90%
rename from apache/airavata/model/process/ttypes.py
rename to airavata/model/process/ttypes.py
index 1dce0d0..9bce399 100644
--- a/apache/airavata/model/process/ttypes.py
+++ b/airavata/model/process/ttypes.py
@@ -9,11 +9,11 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
-import apache.airavata.model.application.io.ttypes
-import apache.airavata.model.status.ttypes
-import apache.airavata.model.task.ttypes
-import apache.airavata.model.scheduling.ttypes
+import airavata.model.commons.ttypes
+import airavata.model.application.io.ttypes
+import airavata.model.status.ttypes
+import airavata.model.task.ttypes
+import airavata.model.scheduling.ttypes
 
 from thrift.transport import TTransport
 
@@ -61,17 +61,17 @@ class ProcessModel(object):
         (2, TType.STRING, 'experimentId', 'UTF8', None, ),  # 2
         (3, TType.I64, 'creationTime', None, None, ),  # 3
         (4, TType.I64, 'lastUpdateTime', None, None, ),  # 4
-        (5, TType.LIST, 'processStatuses', (TType.STRUCT, (apache.airavata.model.status.ttypes.ProcessStatus, apache.airavata.model.status.ttypes.ProcessStatus.thrift_spec), False), None, ),  # 5
+        (5, TType.LIST, 'processStatuses', (TType.STRUCT, (airavata.model.status.ttypes.ProcessStatus, airavata.model.status.ttypes.ProcessStatus.thrift_spec), False), None, ),  # 5
         (6, TType.STRING, 'processDetail', 'UTF8', None, ),  # 6
         (7, TType.STRING, 'applicationInterfaceId', 'UTF8', None, ),  # 7
         (8, TType.STRING, 'applicationDeploymentId', 'UTF8', None, ),  # 8
         (9, TType.STRING, 'computeResourceId', 'UTF8', None, ),  # 9
-        (10, TType.LIST, 'processInputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 10
-        (11, TType.LIST, 'processOutputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 11
-        (12, TType.STRUCT, 'processResourceSchedule', (apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ),  # 12
-        (13, TType.LIST, 'tasks', (TType.STRUCT, (apache.airavata.model.task.ttypes.TaskModel, apache.airavata.model.task.ttypes.TaskModel.thrift_spec), False), None, ),  # 13
+        (10, TType.LIST, 'processInputs', (TType.STRUCT, (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 10
+        (11, TType.LIST, 'processOutputs', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 11
+        (12, TType.STRUCT, 'processResourceSchedule', (airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel, airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel.thrift_spec), None, ),  # 12
+        (13, TType.LIST, 'tasks', (TType.STRUCT, (airavata.model.task.ttypes.TaskModel, airavata.model.task.ttypes.TaskModel.thrift_spec), False), None, ),  # 13
         (14, TType.STRING, 'taskDag', 'UTF8', None, ),  # 14
-        (15, TType.LIST, 'processErrors', (TType.STRUCT, (apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ),  # 15
+        (15, TType.LIST, 'processErrors', (TType.STRUCT, (airavata.model.commons.ttypes.ErrorModel, airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ),  # 15
         (16, TType.STRING, 'gatewayExecutionId', 'UTF8', None, ),  # 16
         (17, TType.BOOL, 'enableEmailNotification', None, None, ),  # 17
         (18, TType.LIST, 'emailAddresses', (TType.STRING, 'UTF8', False), None, ),  # 18
@@ -143,7 +143,7 @@ class ProcessModel(object):
                     self.processStatuses = []
                     (_etype3, _size0) = iprot.readListBegin()
                     for _i4 in range(_size0):
-                        _elem5 = apache.airavata.model.status.ttypes.ProcessStatus()
+                        _elem5 = airavata.model.status.ttypes.ProcessStatus()
                         _elem5.read(iprot)
                         self.processStatuses.append(_elem5)
                     iprot.readListEnd()
@@ -174,7 +174,7 @@ class ProcessModel(object):
                     self.processInputs = []
                     (_etype9, _size6) = iprot.readListBegin()
                     for _i10 in range(_size6):
-                        _elem11 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+                        _elem11 = airavata.model.application.io.ttypes.InputDataObjectType()
                         _elem11.read(iprot)
                         self.processInputs.append(_elem11)
                     iprot.readListEnd()
@@ -185,7 +185,7 @@ class ProcessModel(object):
                     self.processOutputs = []
                     (_etype15, _size12) = iprot.readListBegin()
                     for _i16 in range(_size12):
-                        _elem17 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem17 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem17.read(iprot)
                         self.processOutputs.append(_elem17)
                     iprot.readListEnd()
@@ -193,7 +193,7 @@ class ProcessModel(object):
                     iprot.skip(ftype)
             elif fid == 12:
                 if ftype == TType.STRUCT:
-                    self.processResourceSchedule = apache.airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
+                    self.processResourceSchedule = airavata.model.scheduling.ttypes.ComputationalResourceSchedulingModel()
                     self.processResourceSchedule.read(iprot)
                 else:
                     iprot.skip(ftype)
@@ -202,7 +202,7 @@ class ProcessModel(object):
                     self.tasks = []
                     (_etype21, _size18) = iprot.readListBegin()
                     for _i22 in range(_size18):
-                        _elem23 = apache.airavata.model.task.ttypes.TaskModel()
+                        _elem23 = airavata.model.task.ttypes.TaskModel()
                         _elem23.read(iprot)
                         self.tasks.append(_elem23)
                     iprot.readListEnd()
@@ -218,7 +218,7 @@ class ProcessModel(object):
                     self.processErrors = []
                     (_etype27, _size24) = iprot.readListBegin()
                     for _i28 in range(_size24):
-                        _elem29 = apache.airavata.model.commons.ttypes.ErrorModel()
+                        _elem29 = airavata.model.commons.ttypes.ErrorModel()
                         _elem29.read(iprot)
                         self.processErrors.append(_elem29)
                     iprot.readListEnd()
diff --git a/apache/airavata/model/appcatalog/storageresource/__init__.py b/airavata/model/scheduling/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/storageresource/__init__.py
rename to airavata/model/scheduling/__init__.py
diff --git a/apache/airavata/model/appcatalog/gatewayprofile/constants.py b/airavata/model/scheduling/constants.py
similarity index 100%
rename from apache/airavata/model/appcatalog/gatewayprofile/constants.py
rename to airavata/model/scheduling/constants.py
diff --git a/apache/airavata/model/scheduling/ttypes.py b/airavata/model/scheduling/ttypes.py
similarity index 100%
rename from apache/airavata/model/scheduling/ttypes.py
rename to airavata/model/scheduling/ttypes.py
diff --git a/apache/airavata/model/appcatalog/parallelism/__init__.py b/airavata/model/security/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/parallelism/__init__.py
rename to airavata/model/security/__init__.py
diff --git a/apache/airavata/model/appcatalog/computeresource/constants.py b/airavata/model/security/constants.py
similarity index 100%
rename from apache/airavata/model/appcatalog/computeresource/constants.py
rename to airavata/model/security/constants.py
diff --git a/apache/airavata/model/security/ttypes.py b/airavata/model/security/ttypes.py
similarity index 100%
rename from apache/airavata/model/security/ttypes.py
rename to airavata/model/security/ttypes.py
diff --git a/apache/airavata/model/appcatalog/gatewayprofile/__init__.py b/airavata/model/sharing/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/gatewayprofile/__init__.py
rename to airavata/model/sharing/__init__.py
diff --git a/apache/airavata/model/sharing/constants.py b/airavata/model/sharing/constants.py
similarity index 100%
rename from apache/airavata/model/sharing/constants.py
rename to airavata/model/sharing/constants.py
diff --git a/apache/airavata/model/sharing/ttypes.py b/airavata/model/sharing/ttypes.py
similarity index 100%
rename from apache/airavata/model/sharing/ttypes.py
rename to airavata/model/sharing/ttypes.py
diff --git a/apache/airavata/model/appcatalog/computeresource/__init__.py b/airavata/model/status/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/computeresource/__init__.py
rename to airavata/model/status/__init__.py
diff --git a/apache/airavata/model/appcatalog/appinterface/constants.py b/airavata/model/status/constants.py
similarity index 100%
rename from apache/airavata/model/appcatalog/appinterface/constants.py
rename to airavata/model/status/constants.py
diff --git a/apache/airavata/model/status/ttypes.py b/airavata/model/status/ttypes.py
similarity index 100%
rename from apache/airavata/model/status/ttypes.py
rename to airavata/model/status/ttypes.py
diff --git a/apache/airavata/model/appcatalog/appinterface/__init__.py b/airavata/model/task/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/appinterface/__init__.py
rename to airavata/model/task/__init__.py
diff --git a/apache/airavata/model/appcatalog/appdeployment/constants.py b/airavata/model/task/constants.py
similarity index 100%
rename from apache/airavata/model/appcatalog/appdeployment/constants.py
rename to airavata/model/task/constants.py
diff --git a/apache/airavata/model/task/ttypes.py b/airavata/model/task/ttypes.py
similarity index 93%
rename from apache/airavata/model/task/ttypes.py
rename to airavata/model/task/ttypes.py
index 0163b1f..353df69 100644
--- a/apache/airavata/model/task/ttypes.py
+++ b/airavata/model/task/ttypes.py
@@ -9,12 +9,12 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
-import apache.airavata.model.appcatalog.computeresource.ttypes
-import apache.airavata.model.data.movement.ttypes
-import apache.airavata.model.application.io.ttypes
-import apache.airavata.model.status.ttypes
-import apache.airavata.model.job.ttypes
+import airavata.model.commons.ttypes
+import airavata.model.appcatalog.computeresource.ttypes
+import airavata.model.data.movement.ttypes
+import airavata.model.application.io.ttypes
+import airavata.model.status.ttypes
+import airavata.model.job.ttypes
 
 from thrift.transport import TTransport
 
@@ -105,11 +105,11 @@ class TaskModel(object):
         (3, TType.STRING, 'parentProcessId', 'UTF8', None, ),  # 3
         (4, TType.I64, 'creationTime', None, None, ),  # 4
         (5, TType.I64, 'lastUpdateTime', None, None, ),  # 5
-        (6, TType.LIST, 'taskStatuses', (TType.STRUCT, (apache.airavata.model.status.ttypes.TaskStatus, apache.airavata.model.status.ttypes.TaskStatus.thrift_spec), False), None, ),  # 6
+        (6, TType.LIST, 'taskStatuses', (TType.STRUCT, (airavata.model.status.ttypes.TaskStatus, airavata.model.status.ttypes.TaskStatus.thrift_spec), False), None, ),  # 6
         (7, TType.STRING, 'taskDetail', 'UTF8', None, ),  # 7
         (8, TType.STRING, 'subTaskModel', 'BINARY', None, ),  # 8
-        (9, TType.LIST, 'taskErrors', (TType.STRUCT, (apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ),  # 9
-        (10, TType.LIST, 'jobs', (TType.STRUCT, (apache.airavata.model.job.ttypes.JobModel, apache.airavata.model.job.ttypes.JobModel.thrift_spec), False), None, ),  # 10
+        (9, TType.LIST, 'taskErrors', (TType.STRUCT, (airavata.model.commons.ttypes.ErrorModel, airavata.model.commons.ttypes.ErrorModel.thrift_spec), False), None, ),  # 9
+        (10, TType.LIST, 'jobs', (TType.STRUCT, (airavata.model.job.ttypes.JobModel, airavata.model.job.ttypes.JobModel.thrift_spec), False), None, ),  # 10
     )
 
     def __init__(self, taskId=thrift_spec[1][4], taskType=None, parentProcessId=None, creationTime=None, lastUpdateTime=None, taskStatuses=None, taskDetail=None, subTaskModel=None, taskErrors=None, jobs=None,):
@@ -163,7 +163,7 @@ class TaskModel(object):
                     self.taskStatuses = []
                     (_etype3, _size0) = iprot.readListBegin()
                     for _i4 in range(_size0):
-                        _elem5 = apache.airavata.model.status.ttypes.TaskStatus()
+                        _elem5 = airavata.model.status.ttypes.TaskStatus()
                         _elem5.read(iprot)
                         self.taskStatuses.append(_elem5)
                     iprot.readListEnd()
@@ -184,7 +184,7 @@ class TaskModel(object):
                     self.taskErrors = []
                     (_etype9, _size6) = iprot.readListBegin()
                     for _i10 in range(_size6):
-                        _elem11 = apache.airavata.model.commons.ttypes.ErrorModel()
+                        _elem11 = airavata.model.commons.ttypes.ErrorModel()
                         _elem11.read(iprot)
                         self.taskErrors.append(_elem11)
                     iprot.readListEnd()
@@ -195,7 +195,7 @@ class TaskModel(object):
                     self.jobs = []
                     (_etype15, _size12) = iprot.readListBegin()
                     for _i16 in range(_size12):
-                        _elem17 = apache.airavata.model.job.ttypes.JobModel()
+                        _elem17 = airavata.model.job.ttypes.JobModel()
                         _elem17.read(iprot)
                         self.jobs.append(_elem17)
                     iprot.readListEnd()
@@ -311,8 +311,8 @@ class DataStagingTaskModel(object):
         (4, TType.I64, 'transferStartTime', None, None, ),  # 4
         (5, TType.I64, 'transferEndTime', None, None, ),  # 5
         (6, TType.STRING, 'transferRate', 'UTF8', None, ),  # 6
-        (7, TType.STRUCT, 'processInput', (apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), None, ),  # 7
-        (8, TType.STRUCT, 'processOutput', (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), None, ),  # 8
+        (7, TType.STRUCT, 'processInput', (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), None, ),  # 7
+        (8, TType.STRUCT, 'processOutput', (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), None, ),  # 8
     )
 
     def __init__(self, source=None, destination=None, type=None, transferStartTime=None, transferEndTime=None, transferRate=None, processInput=None, processOutput=None,):
@@ -366,13 +366,13 @@ class DataStagingTaskModel(object):
                     iprot.skip(ftype)
             elif fid == 7:
                 if ftype == TType.STRUCT:
-                    self.processInput = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+                    self.processInput = airavata.model.application.io.ttypes.InputDataObjectType()
                     self.processInput.read(iprot)
                 else:
                     iprot.skip(ftype)
             elif fid == 8:
                 if ftype == TType.STRUCT:
-                    self.processOutput = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                    self.processOutput = airavata.model.application.io.ttypes.OutputDataObjectType()
                     self.processOutput.read(iprot)
                 else:
                     iprot.skip(ftype)
diff --git a/apache/airavata/model/appcatalog/appdeployment/__init__.py b/airavata/model/tenant/__init__.py
similarity index 100%
rename from apache/airavata/model/appcatalog/appdeployment/__init__.py
rename to airavata/model/tenant/__init__.py
diff --git a/apache/airavata/api/sharing/constants.py b/airavata/model/tenant/constants.py
similarity index 100%
rename from apache/airavata/api/sharing/constants.py
rename to airavata/model/tenant/constants.py
diff --git a/apache/airavata/model/tenant/ttypes.py b/airavata/model/tenant/ttypes.py
similarity index 99%
rename from apache/airavata/model/tenant/ttypes.py
rename to airavata/model/tenant/ttypes.py
index 0f42429..bd2bee1 100644
--- a/apache/airavata/model/tenant/ttypes.py
+++ b/airavata/model/tenant/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/airavata/model/ttypes.py b/airavata/model/ttypes.py
new file mode 100644
index 0000000..891db82
--- /dev/null
+++ b/airavata/model/ttypes.py
@@ -0,0 +1,31 @@
+#
+# Autogenerated by Thrift Compiler (0.10.0)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+import sys
+import airavata.model.commons.ttypes
+import airavata.model.workspace.ttypes
+import airavata.api.error.ttypes
+import airavata.model.messaging.event.ttypes
+import airavata.model.security.ttypes
+import airavata.model.dbevent.ttypes
+import airavata.model.experiment.ttypes
+import airavata.model.job.ttypes
+import airavata.model.task.ttypes
+import airavata.model.process.ttypes
+import airavata.model.scheduling.ttypes
+import airavata.model.status.ttypes
+import airavata.model.data.movement.ttypes
+import airavata.model.data.replica.ttypes
+import airavata.model.user.ttypes
+import airavata.model.group.ttypes
+import airavata.model.tenant.ttypes
+import airavata.model.credential.store.ttypes
+
+from thrift.transport import TTransport
diff --git a/apache/airavata/model/__init__.py b/airavata/model/user/__init__.py
similarity index 100%
rename from apache/airavata/model/__init__.py
rename to airavata/model/user/__init__.py
diff --git a/apache/airavata/model/user/constants.py b/airavata/model/user/constants.py
similarity index 100%
rename from apache/airavata/model/user/constants.py
rename to airavata/model/user/constants.py
diff --git a/apache/airavata/model/user/ttypes.py b/airavata/model/user/ttypes.py
similarity index 99%
rename from apache/airavata/model/user/ttypes.py
rename to airavata/model/user/ttypes.py
index cf4f080..a8af028 100644
--- a/apache/airavata/model/user/ttypes.py
+++ b/airavata/model/user/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/apache/airavata/api/error/__init__.py b/airavata/model/workflow/__init__.py
similarity index 100%
rename from apache/airavata/api/error/__init__.py
rename to airavata/model/workflow/__init__.py
diff --git a/apache/airavata/api/error/constants.py b/airavata/model/workflow/constants.py
similarity index 100%
rename from apache/airavata/api/error/constants.py
rename to airavata/model/workflow/constants.py
diff --git a/apache/airavata/model/workflow/ttypes.py b/airavata/model/workflow/ttypes.py
similarity index 97%
rename from apache/airavata/model/workflow/ttypes.py
rename to airavata/model/workflow/ttypes.py
index 068863a..76d2765 100644
--- a/apache/airavata/model/workflow/ttypes.py
+++ b/airavata/model/workflow/ttypes.py
@@ -9,8 +9,8 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.application.io.ttypes
-import apache.airavata.model.commons.ttypes
+import airavata.model.application.io.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
@@ -97,8 +97,8 @@ class WorkflowModel(object):
         (4, TType.STRING, 'gatewayId', 'UTF8', None, ),  # 4
         (5, TType.STRING, 'createdUser', 'UTF8', None, ),  # 5
         (6, TType.STRING, 'image', 'BINARY', None, ),  # 6
-        (7, TType.LIST, 'workflowInputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 7
-        (8, TType.LIST, 'workflowOutputs', (TType.STRUCT, (apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 8
+        (7, TType.LIST, 'workflowInputs', (TType.STRUCT, (airavata.model.application.io.ttypes.InputDataObjectType, airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec), False), None, ),  # 7
+        (8, TType.LIST, 'workflowOutputs', (TType.STRUCT, (airavata.model.application.io.ttypes.OutputDataObjectType, airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec), False), None, ),  # 8
         (9, TType.I64, 'creationTime', None, None, ),  # 9
     )
 
@@ -157,7 +157,7 @@ class WorkflowModel(object):
                     self.workflowInputs = []
                     (_etype3, _size0) = iprot.readListBegin()
                     for _i4 in range(_size0):
-                        _elem5 = apache.airavata.model.application.io.ttypes.InputDataObjectType()
+                        _elem5 = airavata.model.application.io.ttypes.InputDataObjectType()
                         _elem5.read(iprot)
                         self.workflowInputs.append(_elem5)
                     iprot.readListEnd()
@@ -168,7 +168,7 @@ class WorkflowModel(object):
                     self.workflowOutputs = []
                     (_etype9, _size6) = iprot.readListBegin()
                     for _i10 in range(_size6):
-                        _elem11 = apache.airavata.model.application.io.ttypes.OutputDataObjectType()
+                        _elem11 = airavata.model.application.io.ttypes.OutputDataObjectType()
                         _elem11.read(iprot)
                         self.workflowOutputs.append(_elem11)
                     iprot.readListEnd()
diff --git a/credential_store_data_models/__init__.py b/airavata/model/workspace/__init__.py
similarity index 100%
rename from credential_store_data_models/__init__.py
rename to airavata/model/workspace/__init__.py
diff --git a/apache/airavata/model/workspace/constants.py b/airavata/model/workspace/constants.py
similarity index 100%
rename from apache/airavata/model/workspace/constants.py
rename to airavata/model/workspace/constants.py
diff --git a/apache/airavata/model/workspace/ttypes.py b/airavata/model/workspace/ttypes.py
similarity index 99%
rename from apache/airavata/model/workspace/ttypes.py
rename to airavata/model/workspace/ttypes.py
index c37b7b7..b25e05e 100644
--- a/apache/airavata/model/workspace/ttypes.py
+++ b/airavata/model/workspace/ttypes.py
@@ -9,7 +9,7 @@
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
 import sys
-import apache.airavata.model.commons.ttypes
+import airavata.model.commons.ttypes
 
 from thrift.transport import TTransport
 
diff --git a/apache/airavata/api/ttypes.py b/apache/airavata/api/ttypes.py
deleted file mode 100644
index 2a5de1c..0000000
--- a/apache/airavata/api/ttypes.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Autogenerated by Thrift Compiler (0.10.0)
-#
-# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-#
-#  options string: py
-#
-
-from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
-from thrift.protocol.TProtocol import TProtocolException
-import sys
-import apache.airavata.api.error.ttypes
-import apache.airavata.model.security.ttypes
-import apache.airavata.model.ttypes
-import credential_store_data_models.ttypes
-import apache.airavata.model.status.ttypes
-import apache.airavata.model.job.ttypes
-import apache.airavata.model.experiment.ttypes
-import apache.airavata.model.workspace.ttypes
-import apache.airavata.model.scheduling.ttypes
-import apache.airavata.model.application.io.ttypes
-import apache.airavata.model.appcatalog.appdeployment.ttypes
-import apache.airavata.model.appcatalog.appinterface.ttypes
-import apache.airavata.model.appcatalog.computeresource.ttypes
-import apache.airavata.model.appcatalog.storageresource.ttypes
-import apache.airavata.model.appcatalog.gatewayprofile.ttypes
-import apache.airavata.model.appcatalog.userresourceprofile.ttypes
-import apache.airavata.model.data.movement.ttypes
-import apache.airavata.model.workflow.ttypes
-import apache.airavata.model.data.replica.ttypes
-import apache.airavata.model.group.ttypes
-import apache.airavata.model.user.ttypes
-
-from thrift.transport import TTransport
diff --git a/apache/airavata/model/ttypes.py b/apache/airavata/model/ttypes.py
deleted file mode 100644
index b77af5f..0000000
--- a/apache/airavata/model/ttypes.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Autogenerated by Thrift Compiler (0.10.0)
-#
-# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-#
-#  options string: py
-#
-
-from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
-from thrift.protocol.TProtocol import TProtocolException
-import sys
-import apache.airavata.model.commons.ttypes
-import apache.airavata.model.workspace.ttypes
-import apache.airavata.api.error.ttypes
-import apache.airavata.model.messaging.event.ttypes
-import apache.airavata.model.security.ttypes
-import apache.airavata.model.dbevent.ttypes
-import apache.airavata.model.experiment.ttypes
-import apache.airavata.model.job.ttypes
-import apache.airavata.model.task.ttypes
-import apache.airavata.model.process.ttypes
-import apache.airavata.model.scheduling.ttypes
-import apache.airavata.model.status.ttypes
-import apache.airavata.model.data.movement.ttypes
-import apache.airavata.model.data.replica.ttypes
-import apache.airavata.model.user.ttypes
-import apache.airavata.model.group.ttypes
-import apache.airavata.model.tenant.ttypes
-import credential_store_data_models.ttypes
-
-from thrift.transport import TTransport
diff --git a/django_airavata/apps/api/serializers.py b/django_airavata/apps/api/serializers.py
index 45af1f1..afc213c 100644
--- a/django_airavata/apps/api/serializers.py
+++ b/django_airavata/apps/api/serializers.py
@@ -1,13 +1,13 @@
 from abc import ABC
 
-from apache.airavata.model.experiment.ttypes import ExperimentModel
-from apache.airavata.model.workspace.ttypes import Project
-from apache.airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule
-from apache.airavata.model.appcatalog.appinterface.ttypes import ApplicationInterfaceDescription
-from apache.airavata.model.application.io.ttypes import InputDataObjectType, OutputDataObjectType
-from apache.airavata.model.experiment.ttypes import ExperimentModel
-from apache.airavata.model.workspace.ttypes import Project
-from apache.airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule
+from airavata.model.experiment.ttypes import ExperimentModel
+from airavata.model.workspace.ttypes import Project
+from airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule
+from airavata.model.appcatalog.appinterface.ttypes import ApplicationInterfaceDescription
+from airavata.model.application.io.ttypes import InputDataObjectType, OutputDataObjectType
+from airavata.model.experiment.ttypes import ExperimentModel
+from airavata.model.workspace.ttypes import Project
+from airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule
 from django.conf import settings
 
 from rest_framework import serializers
diff --git a/django_airavata/apps/api/views.py b/django_airavata/apps/api/views.py
index 1e72668..07e5722 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -15,8 +15,8 @@ from django.http import JsonResponse, Http404
 from django.shortcuts import render
 from django.views.decorators.csrf import csrf_exempt
 
-from apache.airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule, ApplicationDeploymentDescription
-from apache.airavata.model.appcatalog.appinterface.ttypes import ApplicationInterfaceDescription
+from airavata.model.appcatalog.appdeployment.ttypes import ApplicationModule, ApplicationDeploymentDescription
+from airavata.model.appcatalog.appinterface.ttypes import ApplicationInterfaceDescription
 
 from collections import OrderedDict
 import logging
diff --git a/django_airavata/apps/auth/utils.py b/django_airavata/apps/auth/utils.py
index 7d0bee4..d9984ee 100644
--- a/django_airavata/apps/auth/utils.py
+++ b/django_airavata/apps/auth/utils.py
@@ -1,5 +1,5 @@
 
-from apache.airavata.model.security.ttypes import AuthzToken
+from airavata.model.security.ttypes import AuthzToken
 
 from django.conf import settings
 
diff --git a/django_airavata/apps/groups/views.py b/django_airavata/apps/groups/views.py
index f34a68e..895fd70 100644
--- a/django_airavata/apps/groups/views.py
+++ b/django_airavata/apps/groups/views.py
@@ -5,8 +5,8 @@ from django.shortcuts import render, redirect
 
 from .forms import CreateForm, AddForm, RemoveForm
 from django.contrib import messages
-from apache.airavata.model.sharing.ttypes import UserGroup
-from apache.airavata.model.sharing.ttypes import GroupCardinality
+from airavata.model.sharing.ttypes import UserGroup
+from airavata.model.sharing.ttypes import GroupCardinality
 import datetime
 import uuid
 
diff --git a/django_airavata/middleware.py b/django_airavata/middleware.py
index 8954d11..fa10349 100644
--- a/django_airavata/middleware.py
+++ b/django_airavata/middleware.py
@@ -1,6 +1,6 @@
 
-from apache.airavata.api import Airavata
-from apache.airavata.api.sharing import SharingRegistryService
+from airavata.api import Airavata
+from airavata.api.sharing import SharingRegistryService
 
 from thrift import Thrift
 from thrift.transport import TSSLSocket

-- 
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <co...@airavata.apache.org>'].