You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/08/29 05:03:14 UTC

[airavata] branch revert-203-develop created (now 0fa6b14)

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

dimuthuupe pushed a change to branch revert-203-develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


      at 0fa6b14  Revert "Adding Workflow Related Thrift Models and Database Models"

This branch includes the following new commits:

     new 0fa6b14  Revert "Adding Workflow Related Thrift Models and Database Models"

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[airavata] 01/01: Revert "Adding Workflow Related Thrift Models and Database Models"

Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch revert-203-develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 0fa6b1429f55003bbb5cc1caf3c86b2bffc518b8
Author: Dimuthu <di...@gmail.com>
AuthorDate: Wed Aug 29 01:03:11 2018 -0400

    Revert "Adding Workflow Related Thrift Models and Database Models"
---
 .../api/server/handler/AiravataServerHandler.java  |   26 +-
 .../java/org/apache/airavata/api/Airavata.java     |  694 +++----
 .../airavata/model/workflow/AiravataWorkflow.java  | 2144 --------------------
 .../airavata/model/workflow/ApplicationConfig.java |  885 --------
 .../airavata/model/workflow/ApplicationState.java  |   83 -
 .../airavata/model/workflow/ApplicationStatus.java |  708 -------
 .../airavata/model/workflow/HandlerState.java      |   83 -
 .../airavata/model/workflow/HandlerStatus.java     |  708 -------
 .../airavata/model/workflow/HandlerType.java       |   68 -
 .../airavata/model/workflow/NotificationEmail.java |  380 ----
 .../model/workflow/WorkflowApplication.java        | 1701 ----------------
 .../model/workflow/WorkflowConnection.java         | 1303 ------------
 .../airavata/model/workflow/WorkflowHandler.java   | 1901 -----------------
 .../airavata/model/workflow/WorkflowState.java     |   92 -
 .../airavata/model/workflow/WorkflowStatus.java    |  708 -------
 .../model/workflow/core/ComponentType.java         |   62 -
 .../airavata/model/workflow/core/DataBlock.java    |  806 --------
 .../AiravataWorkflowEntity.java                    |  200 --
 .../AiravataWorkflowErrorEntity.java               |  129 --
 .../AiravataWorkflowErrorPK.java                   |   65 -
 .../AiravataWorkflowStatusEntity.java              |  106 -
 .../AiravataWorkflowStatusPK.java                  |   65 -
 .../ApplicationErrorEntity.java                    |  129 --
 .../ApplicationErrorPK.java                        |   65 -
 .../ApplicationStatusEntity.java                   |  106 -
 .../ApplicationStatusPK.java                       |   65 -
 .../HandlerErrorEntity.java                        |  129 --
 .../airavataworkflowcatalog/HandlerErrorPK.java    |   65 -
 .../HandlerInputEntity.java                        |  206 --
 .../airavataworkflowcatalog/HandlerInputPK.java    |   65 -
 .../HandlerOutputEntity.java                       |  184 --
 .../airavataworkflowcatalog/HandlerOutputPK.java   |   65 -
 .../HandlerStatusEntity.java                       |  103 -
 .../airavataworkflowcatalog/HandlerStatusPK.java   |   65 -
 .../NotificationEmailEntity.java                   |   69 -
 .../NotificationEmailPK.java                       |   65 -
 .../WorkflowApplicationEntity.java                 |  203 --
 .../WorkflowApplicationPK.java                     |   65 -
 .../WorkflowConnectionEntity.java                  |  196 --
 .../WorkflowConnectionPK.java                      |   65 -
 .../WorkflowDataBlockEntity.java                   |  124 --
 .../WorkflowHandlerEntity.java                     |  162 --
 .../airavataworkflowcatalog/WorkflowHandlerPK.java |   65 -
 .../workflowcatalog/WorkflowRepository.java        |  182 +-
 .../airavata/registry/core/utils/DBConstants.java  |    2 +-
 .../utils/JPAUtil/WorkflowCatalogJPAUtils.java     |    2 +-
 .../registry/core/utils/QueryConstants.java        |    8 +-
 .../src/main/resources/META-INF/persistence.xml    |   25 +-
 .../resources/airavataworkflowcatalog-derby.sql    |  180 --
 .../workflowcatalog/WorkflowRepositoryTest.java    |  212 +-
 .../workflowcatalog/util/Initialize.java           |    2 +-
 .../resources/airavataworkflowcatalog-derby.sql    |  180 --
 .../workflow/catalog/impl/WorkflowCatalogImpl.java |  352 ++--
 .../airavata/registry/cpi/WorkflowCatalog.java     |   18 +-
 .../api/service/handler/RegistryServerHandler.java |   26 +-
 .../airavata/registry/api/RegistryService.java     |  686 +++----
 .../airavata-apis/airavata_api.thrift              |   14 +-
 .../component-cpis/registry-api.thrift             |   14 +-
 .../airavata_workflow_model.thrift                 |   73 -
 .../core-models/component_type.thrift              |   29 -
 .../core-models/data_block_model.thrift            |   34 -
 .../workflow_application_model.thrift              |   61 -
 .../workflow_connection_model.thrift               |   41 -
 .../workflow_handler_model.thrift                  |   70 -
 .../generate-thrift-stubs.sh                       |    3 -
 65 files changed, 1056 insertions(+), 16336 deletions(-)

diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index ef70d28..fc7e1f9 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -37,6 +37,7 @@ import org.apache.airavata.messaging.core.MessageContext;
 import org.apache.airavata.messaging.core.MessagingFactory;
 import org.apache.airavata.messaging.core.Publisher;
 import org.apache.airavata.messaging.core.Type;
+import org.apache.airavata.model.WorkflowModel;
 import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner;
 import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam;
 import org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParamType;
@@ -78,7 +79,6 @@ import org.apache.airavata.model.status.ExperimentState;
 import org.apache.airavata.model.status.ExperimentStatus;
 import org.apache.airavata.model.status.JobStatus;
 import org.apache.airavata.model.status.QueueStatusModel;
-import org.apache.airavata.model.workflow.AiravataWorkflow;
 import org.apache.airavata.model.workspace.Gateway;
 import org.apache.airavata.model.workspace.Notification;
 import org.apache.airavata.model.workspace.Project;
@@ -4813,7 +4813,7 @@ public class AiravataServerHandler implements Airavata.Iface {
             registryClientPool.returnResource(regClient);
             return result;
         } catch (Exception e) {
-            String msg = "Error in retrieving all workflow Ids.";
+            String msg = "Error in retrieving all workflow template Ids.";
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
             exception.setMessage(msg+" More info : " + e.getMessage());
@@ -4841,15 +4841,15 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public AiravataWorkflow getWorkflow(AuthzToken authzToken, String workflowId)
+    public WorkflowModel getWorkflow(AuthzToken authzToken, String workflowTemplateId)
             throws InvalidRequestException, AiravataClientException, AuthorizationException, AiravataSystemException, TException {
         RegistryService.Client regClient = registryClientPool.getResource();
         try {
-            AiravataWorkflow result = regClient.getWorkflow(workflowId);
+            WorkflowModel result = regClient.getWorkflow(workflowTemplateId);
             registryClientPool.returnResource(regClient);
             return result;
         } catch (Exception e) {
-            String msg = "Error in retrieving the workflow "+workflowId+".";
+            String msg = "Error in retrieving the workflow "+workflowTemplateId+".";
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
             exception.setMessage(msg+" More info : " + e.getMessage());
@@ -4860,15 +4860,15 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public void deleteWorkflow(AuthzToken authzToken, String workflowId)
+    public void deleteWorkflow(AuthzToken authzToken, String workflowTemplateId)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         RegistryService.Client regClient = registryClientPool.getResource();
         try {
-            regClient.deleteWorkflow(workflowId);
+            regClient.deleteWorkflow(workflowTemplateId);
             registryClientPool.returnResource(regClient);
             return;
         } catch (Exception e) {
-            String msg = "Error in deleting the workflow "+workflowId+".";
+            String msg = "Error in deleting the workflow "+workflowTemplateId+".";
             logger.error(msg, e);
             AiravataSystemException exception = new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
             exception.setMessage(msg+" More info : " + e.getMessage());
@@ -4879,7 +4879,7 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public String registerWorkflow(AuthzToken authzToken, String gatewayId, AiravataWorkflow workflow)
+    public String registerWorkflow(AuthzToken authzToken, String gatewayId, WorkflowModel workflow)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         RegistryService.Client regClient = registryClientPool.getResource();
         try {
@@ -4898,11 +4898,11 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public void updateWorkflow(AuthzToken authzToken, String workflowId, AiravataWorkflow workflow)
+    public void updateWorkflow(AuthzToken authzToken, String workflowTemplateId, WorkflowModel workflow)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         RegistryService.Client regClient = registryClientPool.getResource();
         try {
-            regClient.updateWorkflow(workflowId, workflow);
+            regClient.updateWorkflow(workflowTemplateId, workflow);
             registryClientPool.returnResource(regClient);
             return;
         } catch (Exception e) {
@@ -4917,11 +4917,11 @@ public class AiravataServerHandler implements Airavata.Iface {
 
     @Override
     @SecurityCheck
-    public String getWorkflowId(AuthzToken authzToken, String workflowName)
+    public String getWorkflowTemplateId(AuthzToken authzToken, String workflowName)
             throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         RegistryService.Client regClient = registryClientPool.getResource();
         try {
-            String result = regClient.getWorkflowId(workflowName);
+            String result = regClient.getWorkflowTemplateId(workflowName);
             registryClientPool.returnResource(regClient);
             return result;
         } catch (Exception e) {
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index c9cfa43..4eb15dd 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -3035,17 +3035,17 @@ public class Airavata {
      * 
      * 
      * @param authzToken
-     * @param workflowId
+     * @param workflowTemplateId
      */
-    public org.apache.airavata.model.workflow.AiravataWorkflow getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public org.apache.airavata.model.WorkflowModel getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public java.lang.String registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.workflow.AiravataWorkflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public java.lang.String registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.WorkflowModel workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.airavata.model.workflow.AiravataWorkflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public java.lang.String getWorkflowId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public java.lang.String getWorkflowTemplateId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     public boolean isWorkflowExistWithName(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
@@ -3441,15 +3441,15 @@ public class Airavata {
 
     public void getLatestQueueStatuses(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.airavata.model.status.QueueStatusModel>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workflow.AiravataWorkflow> resultHandler) throws org.apache.thrift.TException;
+    public void getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.WorkflowModel> resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.workflow.AiravataWorkflow workflow, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.airavata.model.workflow.AiravataWorkflow workflow, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getWorkflowId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
+    public void getWorkflowTemplateId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
     public void isWorkflowExistWithName(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
@@ -9312,21 +9312,21 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLatestQueueStatuses failed: unknown result");
     }
 
-    public org.apache.airavata.model.workflow.AiravataWorkflow getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public org.apache.airavata.model.WorkflowModel getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_getWorkflow(authzToken, workflowId);
+      send_getWorkflow(authzToken, workflowTemplateId);
       return recv_getWorkflow();
     }
 
-    public void send_getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId) throws org.apache.thrift.TException
+    public void send_getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId) throws org.apache.thrift.TException
     {
       getWorkflow_args args = new getWorkflow_args();
       args.setAuthzToken(authzToken);
-      args.setWorkflowId(workflowId);
+      args.setWorkflowTemplateId(workflowTemplateId);
       sendBase("getWorkflow", args);
     }
 
-    public org.apache.airavata.model.workflow.AiravataWorkflow recv_getWorkflow() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public org.apache.airavata.model.WorkflowModel recv_getWorkflow() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
       getWorkflow_result result = new getWorkflow_result();
       receiveBase(result, "getWorkflow");
@@ -9348,17 +9348,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getWorkflow failed: unknown result");
     }
 
-    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_deleteWorkflow(authzToken, workflowId);
+      send_deleteWorkflow(authzToken, workflowTemplateId);
       recv_deleteWorkflow();
     }
 
-    public void send_deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId) throws org.apache.thrift.TException
+    public void send_deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId) throws org.apache.thrift.TException
     {
       deleteWorkflow_args args = new deleteWorkflow_args();
       args.setAuthzToken(authzToken);
-      args.setWorkflowId(workflowId);
+      args.setWorkflowTemplateId(workflowTemplateId);
       sendBase("deleteWorkflow", args);
     }
 
@@ -9381,13 +9381,13 @@ public class Airavata {
       return;
     }
 
-    public java.lang.String registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.workflow.AiravataWorkflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public java.lang.String registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.WorkflowModel workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
       send_registerWorkflow(authzToken, gatewayId, workflow);
       return recv_registerWorkflow();
     }
 
-    public void send_registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.workflow.AiravataWorkflow workflow) throws org.apache.thrift.TException
+    public void send_registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.WorkflowModel workflow) throws org.apache.thrift.TException
     {
       registerWorkflow_args args = new registerWorkflow_args();
       args.setAuthzToken(authzToken);
@@ -9418,17 +9418,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerWorkflow failed: unknown result");
     }
 
-    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.airavata.model.workflow.AiravataWorkflow workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_updateWorkflow(authzToken, workflowId, workflow);
+      send_updateWorkflow(authzToken, workflowTemplateId, workflow);
       recv_updateWorkflow();
     }
 
-    public void send_updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.airavata.model.workflow.AiravataWorkflow workflow) throws org.apache.thrift.TException
+    public void send_updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow) throws org.apache.thrift.TException
     {
       updateWorkflow_args args = new updateWorkflow_args();
       args.setAuthzToken(authzToken);
-      args.setWorkflowId(workflowId);
+      args.setWorkflowTemplateId(workflowTemplateId);
       args.setWorkflow(workflow);
       sendBase("updateWorkflow", args);
     }
@@ -9452,24 +9452,24 @@ public class Airavata {
       return;
     }
 
-    public java.lang.String getWorkflowId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public java.lang.String getWorkflowTemplateId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_getWorkflowId(authzToken, workflowName);
-      return recv_getWorkflowId();
+      send_getWorkflowTemplateId(authzToken, workflowName);
+      return recv_getWorkflowTemplateId();
     }
 
-    public void send_getWorkflowId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.thrift.TException
+    public void send_getWorkflowTemplateId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.thrift.TException
     {
-      getWorkflowId_args args = new getWorkflowId_args();
+      getWorkflowTemplateId_args args = new getWorkflowTemplateId_args();
       args.setAuthzToken(authzToken);
       args.setWorkflowName(workflowName);
-      sendBase("getWorkflowId", args);
+      sendBase("getWorkflowTemplateId", args);
     }
 
-    public java.lang.String recv_getWorkflowId() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public java.lang.String recv_getWorkflowTemplateId() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      getWorkflowId_result result = new getWorkflowId_result();
-      receiveBase(result, "getWorkflowId");
+      getWorkflowTemplateId_result result = new getWorkflowTemplateId_result();
+      receiveBase(result, "getWorkflowTemplateId");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -9485,7 +9485,7 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getWorkflowId failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getWorkflowTemplateId failed: unknown result");
     }
 
     public boolean isWorkflowExistWithName(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -16416,32 +16416,32 @@ public class Airavata {
       }
     }
 
-    public void getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workflow.AiravataWorkflow> resultHandler) throws org.apache.thrift.TException {
+    public void getWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.WorkflowModel> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getWorkflow_call method_call = new getWorkflow_call(authzToken, workflowId, resultHandler, this, ___protocolFactory, ___transport);
+      getWorkflow_call method_call = new getWorkflow_call(authzToken, workflowTemplateId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getWorkflow_call extends org.apache.thrift.async.TAsyncMethodCall<org.apache.airavata.model.workflow.AiravataWorkflow> {
+    public static class getWorkflow_call extends org.apache.thrift.async.TAsyncMethodCall<org.apache.airavata.model.WorkflowModel> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
-      private java.lang.String workflowId;
-      public getWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workflow.AiravataWorkflow> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private java.lang.String workflowTemplateId;
+      public getWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.WorkflowModel> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
-        this.workflowId = workflowId;
+        this.workflowTemplateId = workflowTemplateId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getWorkflow", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getWorkflow_args args = new getWorkflow_args();
         args.setAuthzToken(authzToken);
-        args.setWorkflowId(workflowId);
+        args.setWorkflowTemplateId(workflowTemplateId);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public org.apache.airavata.model.workflow.AiravataWorkflow getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+      public org.apache.airavata.model.WorkflowModel getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new java.lang.IllegalStateException("Method call not finished!");
         }
@@ -16451,27 +16451,27 @@ public class Airavata {
       }
     }
 
-    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void deleteWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      deleteWorkflow_call method_call = new deleteWorkflow_call(authzToken, workflowId, resultHandler, this, ___protocolFactory, ___transport);
+      deleteWorkflow_call method_call = new deleteWorkflow_call(authzToken, workflowTemplateId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deleteWorkflow_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
-      private java.lang.String workflowId;
-      public deleteWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private java.lang.String workflowTemplateId;
+      public deleteWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
-        this.workflowId = workflowId;
+        this.workflowTemplateId = workflowTemplateId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteWorkflow", org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteWorkflow_args args = new deleteWorkflow_args();
         args.setAuthzToken(authzToken);
-        args.setWorkflowId(workflowId);
+        args.setWorkflowTemplateId(workflowTemplateId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -16486,7 +16486,7 @@ public class Airavata {
       }
     }
 
-    public void registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.workflow.AiravataWorkflow workflow, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+    public void registerWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       registerWorkflow_call method_call = new registerWorkflow_call(authzToken, gatewayId, workflow, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -16496,8 +16496,8 @@ public class Airavata {
     public static class registerWorkflow_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String gatewayId;
-      private org.apache.airavata.model.workflow.AiravataWorkflow workflow;
-      public registerWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.workflow.AiravataWorkflow workflow, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private org.apache.airavata.model.WorkflowModel workflow;
+      public registerWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String gatewayId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.gatewayId = gatewayId;
@@ -16524,21 +16524,21 @@ public class Airavata {
       }
     }
 
-    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.airavata.model.workflow.AiravataWorkflow workflow, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void updateWorkflow(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      updateWorkflow_call method_call = new updateWorkflow_call(authzToken, workflowId, workflow, resultHandler, this, ___protocolFactory, ___transport);
+      updateWorkflow_call method_call = new updateWorkflow_call(authzToken, workflowTemplateId, workflow, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class updateWorkflow_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
-      private java.lang.String workflowId;
-      private org.apache.airavata.model.workflow.AiravataWorkflow workflow;
-      public updateWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowId, org.apache.airavata.model.workflow.AiravataWorkflow workflow, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private java.lang.String workflowTemplateId;
+      private org.apache.airavata.model.WorkflowModel workflow;
+      public updateWorkflow_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowTemplateId, org.apache.airavata.model.WorkflowModel workflow, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
-        this.workflowId = workflowId;
+        this.workflowTemplateId = workflowTemplateId;
         this.workflow = workflow;
       }
 
@@ -16546,7 +16546,7 @@ public class Airavata {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateWorkflow", org.apache.thrift.protocol.TMessageType.CALL, 0));
         updateWorkflow_args args = new updateWorkflow_args();
         args.setAuthzToken(authzToken);
-        args.setWorkflowId(workflowId);
+        args.setWorkflowTemplateId(workflowTemplateId);
         args.setWorkflow(workflow);
         args.write(prot);
         prot.writeMessageEnd();
@@ -16562,25 +16562,25 @@ public class Airavata {
       }
     }
 
-    public void getWorkflowId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+    public void getWorkflowTemplateId(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getWorkflowId_call method_call = new getWorkflowId_call(authzToken, workflowName, resultHandler, this, ___protocolFactory, ___transport);
+      getWorkflowTemplateId_call method_call = new getWorkflowTemplateId_call(authzToken, workflowName, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getWorkflowId_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+    public static class getWorkflowTemplateId_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String workflowName;
-      public getWorkflowId_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getWorkflowTemplateId_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String workflowName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.workflowName = workflowName;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getWorkflowId", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getWorkflowId_args args = new getWorkflowId_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getWorkflowTemplateId", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getWorkflowTemplateId_args args = new getWorkflowTemplateId_args();
         args.setAuthzToken(authzToken);
         args.setWorkflowName(workflowName);
         args.write(prot);
@@ -16593,7 +16593,7 @@ public class Airavata {
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getWorkflowId();
+        return (new Client(prot)).recv_getWorkflowTemplateId();
       }
     }
 
@@ -17775,7 +17775,7 @@ public class Airavata {
       processMap.put("deleteWorkflow", new deleteWorkflow());
       processMap.put("registerWorkflow", new registerWorkflow());
       processMap.put("updateWorkflow", new updateWorkflow());
-      processMap.put("getWorkflowId", new getWorkflowId());
+      processMap.put("getWorkflowTemplateId", new getWorkflowTemplateId());
       processMap.put("isWorkflowExistWithName", new isWorkflowExistWithName());
       processMap.put("registerDataProduct", new registerDataProduct());
       processMap.put("getDataProduct", new getDataProduct());
@@ -22599,7 +22599,7 @@ public class Airavata {
       public getWorkflow_result getResult(I iface, getWorkflow_args args) throws org.apache.thrift.TException {
         getWorkflow_result result = new getWorkflow_result();
         try {
-          result.success = iface.getWorkflow(args.authzToken, args.workflowId);
+          result.success = iface.getWorkflow(args.authzToken, args.workflowTemplateId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -22629,7 +22629,7 @@ public class Airavata {
       public deleteWorkflow_result getResult(I iface, deleteWorkflow_args args) throws org.apache.thrift.TException {
         deleteWorkflow_result result = new deleteWorkflow_result();
         try {
-          iface.deleteWorkflow(args.authzToken, args.workflowId);
+          iface.deleteWorkflow(args.authzToken, args.workflowTemplateId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -22689,7 +22689,7 @@ public class Airavata {
       public updateWorkflow_result getResult(I iface, updateWorkflow_args args) throws org.apache.thrift.TException {
         updateWorkflow_result result = new updateWorkflow_result();
         try {
-          iface.updateWorkflow(args.authzToken, args.workflowId, args.workflow);
+          iface.updateWorkflow(args.authzToken, args.workflowTemplateId, args.workflow);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -22703,23 +22703,23 @@ public class Airavata {
       }
     }
 
-    public static class getWorkflowId<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getWorkflowId_args> {
-      public getWorkflowId() {
-        super("getWorkflowId");
+    public static class getWorkflowTemplateId<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getWorkflowTemplateId_args> {
+      public getWorkflowTemplateId() {
+        super("getWorkflowTemplateId");
       }
 
-      public getWorkflowId_args getEmptyArgsInstance() {
-        return new getWorkflowId_args();
+      public getWorkflowTemplateId_args getEmptyArgsInstance() {
+        return new getWorkflowTemplateId_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getWorkflowId_result getResult(I iface, getWorkflowId_args args) throws org.apache.thrift.TException {
-        getWorkflowId_result result = new getWorkflowId_result();
+      public getWorkflowTemplateId_result getResult(I iface, getWorkflowTemplateId_args args) throws org.apache.thrift.TException {
+        getWorkflowTemplateId_result result = new getWorkflowTemplateId_result();
         try {
-          result.success = iface.getWorkflowId(args.authzToken, args.workflowName);
+          result.success = iface.getWorkflowTemplateId(args.authzToken, args.workflowName);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -23757,7 +23757,7 @@ public class Airavata {
       processMap.put("deleteWorkflow", new deleteWorkflow());
       processMap.put("registerWorkflow", new registerWorkflow());
       processMap.put("updateWorkflow", new updateWorkflow());
-      processMap.put("getWorkflowId", new getWorkflowId());
+      processMap.put("getWorkflowTemplateId", new getWorkflowTemplateId());
       processMap.put("isWorkflowExistWithName", new isWorkflowExistWithName());
       processMap.put("registerDataProduct", new registerDataProduct());
       processMap.put("getDataProduct", new getDataProduct());
@@ -35948,7 +35948,7 @@ public class Airavata {
       }
     }
 
-    public static class getWorkflow<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getWorkflow_args, org.apache.airavata.model.workflow.AiravataWorkflow> {
+    public static class getWorkflow<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getWorkflow_args, org.apache.airavata.model.WorkflowModel> {
       public getWorkflow() {
         super("getWorkflow");
       }
@@ -35957,10 +35957,10 @@ public class Airavata {
         return new getWorkflow_args();
       }
 
-      public org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workflow.AiravataWorkflow> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.WorkflowModel> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workflow.AiravataWorkflow>() { 
-          public void onComplete(org.apache.airavata.model.workflow.AiravataWorkflow o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.WorkflowModel>() { 
+          public void onComplete(org.apache.airavata.model.WorkflowModel o) {
             getWorkflow_result result = new getWorkflow_result();
             result.success = o;
             try {
@@ -36020,8 +36020,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getWorkflow_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.workflow.AiravataWorkflow> resultHandler) throws org.apache.thrift.TException {
-        iface.getWorkflow(args.authzToken, args.workflowId,resultHandler);
+      public void start(I iface, getWorkflow_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.WorkflowModel> resultHandler) throws org.apache.thrift.TException {
+        iface.getWorkflow(args.authzToken, args.workflowTemplateId,resultHandler);
       }
     }
 
@@ -36097,7 +36097,7 @@ public class Airavata {
       }
 
       public void start(I iface, deleteWorkflow_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
-        iface.deleteWorkflow(args.authzToken, args.workflowId,resultHandler);
+        iface.deleteWorkflow(args.authzToken, args.workflowTemplateId,resultHandler);
       }
     }
 
@@ -36250,24 +36250,24 @@ public class Airavata {
       }
 
       public void start(I iface, updateWorkflow_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
-        iface.updateWorkflow(args.authzToken, args.workflowId, args.workflow,resultHandler);
+        iface.updateWorkflow(args.authzToken, args.workflowTemplateId, args.workflow,resultHandler);
       }
     }
 
-    public static class getWorkflowId<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getWorkflowId_args, java.lang.String> {
-      public getWorkflowId() {
-        super("getWorkflowId");
+    public static class getWorkflowTemplateId<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getWorkflowTemplateId_args, java.lang.String> {
+      public getWorkflowTemplateId() {
+        super("getWorkflowTemplateId");
       }
 
-      public getWorkflowId_args getEmptyArgsInstance() {
-        return new getWorkflowId_args();
+      public getWorkflowTemplateId_args getEmptyArgsInstance() {
+        return new getWorkflowTemplateId_args();
       }
 
       public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new org.apache.thrift.async.AsyncMethodCallback<java.lang.String>() { 
           public void onComplete(java.lang.String o) {
-            getWorkflowId_result result = new getWorkflowId_result();
+            getWorkflowTemplateId_result result = new getWorkflowTemplateId_result();
             result.success = o;
             try {
               fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -36282,7 +36282,7 @@ public class Airavata {
           public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TSerializable msg;
-            getWorkflowId_result result = new getWorkflowId_result();
+            getWorkflowTemplateId_result result = new getWorkflowTemplateId_result();
             if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
               result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
               result.setIreIsSet(true);
@@ -36326,8 +36326,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getWorkflowId_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
-        iface.getWorkflowId(args.authzToken, args.workflowName,resultHandler);
+      public void start(I iface, getWorkflowTemplateId_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
+        iface.getWorkflowTemplateId(args.authzToken, args.workflowName,resultHandler);
       }
     }
 
@@ -250131,18 +250131,18 @@ public class Airavata {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getWorkflow_args");
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField WORKFLOW_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowId", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField WORKFLOW_TEMPLATE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowTemplateId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getWorkflow_argsStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getWorkflow_argsTupleSchemeFactory();
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
-    public java.lang.String workflowId; // required
+    public java.lang.String workflowTemplateId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      WORKFLOW_ID((short)2, "workflowId");
+      WORKFLOW_TEMPLATE_ID((short)2, "workflowTemplateId");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -250159,8 +250159,8 @@ public class Airavata {
         switch(fieldId) {
           case 1: // AUTHZ_TOKEN
             return AUTHZ_TOKEN;
-          case 2: // WORKFLOW_ID
-            return WORKFLOW_ID;
+          case 2: // WORKFLOW_TEMPLATE_ID
+            return WORKFLOW_TEMPLATE_ID;
           default:
             return null;
         }
@@ -250206,7 +250206,7 @@ public class Airavata {
       java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
-      tmpMap.put(_Fields.WORKFLOW_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+      tmpMap.put(_Fields.WORKFLOW_TEMPLATE_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowTemplateId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getWorkflow_args.class, metaDataMap);
@@ -250217,11 +250217,11 @@ public class Airavata {
 
     public getWorkflow_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      java.lang.String workflowId)
+      java.lang.String workflowTemplateId)
     {
       this();
       this.authzToken = authzToken;
-      this.workflowId = workflowId;
+      this.workflowTemplateId = workflowTemplateId;
     }
 
     /**
@@ -250231,8 +250231,8 @@ public class Airavata {
       if (other.isSetAuthzToken()) {
         this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
-      if (other.isSetWorkflowId()) {
-        this.workflowId = other.workflowId;
+      if (other.isSetWorkflowTemplateId()) {
+        this.workflowTemplateId = other.workflowTemplateId;
       }
     }
 
@@ -250243,7 +250243,7 @@ public class Airavata {
     @Override
     public void clear() {
       this.authzToken = null;
-      this.workflowId = null;
+      this.workflowTemplateId = null;
     }
 
     public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -250270,27 +250270,27 @@ public class Airavata {
       }
     }
 
-    public java.lang.String getWorkflowId() {
-      return this.workflowId;
+    public java.lang.String getWorkflowTemplateId() {
+      return this.workflowTemplateId;
     }
 
-    public getWorkflow_args setWorkflowId(java.lang.String workflowId) {
-      this.workflowId = workflowId;
+    public getWorkflow_args setWorkflowTemplateId(java.lang.String workflowTemplateId) {
+      this.workflowTemplateId = workflowTemplateId;
       return this;
     }
 
-    public void unsetWorkflowId() {
-      this.workflowId = null;
+    public void unsetWorkflowTemplateId() {
+      this.workflowTemplateId = null;
     }
 
-    /** Returns true if field workflowId is set (has been assigned a value) and false otherwise */
-    public boolean isSetWorkflowId() {
-      return this.workflowId != null;
+    /** Returns true if field workflowTemplateId is set (has been assigned a value) and false otherwise */
+    public boolean isSetWorkflowTemplateId() {
+      return this.workflowTemplateId != null;
     }
 
-    public void setWorkflowIdIsSet(boolean value) {
+    public void setWorkflowTemplateIdIsSet(boolean value) {
       if (!value) {
-        this.workflowId = null;
+        this.workflowTemplateId = null;
       }
     }
 
@@ -250304,11 +250304,11 @@ public class Airavata {
         }
         break;
 
-      case WORKFLOW_ID:
+      case WORKFLOW_TEMPLATE_ID:
         if (value == null) {
-          unsetWorkflowId();
+          unsetWorkflowTemplateId();
         } else {
-          setWorkflowId((java.lang.String)value);
+          setWorkflowTemplateId((java.lang.String)value);
         }
         break;
 
@@ -250320,8 +250320,8 @@ public class Airavata {
       case AUTHZ_TOKEN:
         return getAuthzToken();
 
-      case WORKFLOW_ID:
-        return getWorkflowId();
+      case WORKFLOW_TEMPLATE_ID:
+        return getWorkflowTemplateId();
 
       }
       throw new java.lang.IllegalStateException();
@@ -250336,8 +250336,8 @@ public class Airavata {
       switch (field) {
       case AUTHZ_TOKEN:
         return isSetAuthzToken();
-      case WORKFLOW_ID:
-        return isSetWorkflowId();
+      case WORKFLOW_TEMPLATE_ID:
+        return isSetWorkflowTemplateId();
       }
       throw new java.lang.IllegalStateException();
     }
@@ -250366,12 +250366,12 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_workflowId = true && this.isSetWorkflowId();
-      boolean that_present_workflowId = true && that.isSetWorkflowId();
-      if (this_present_workflowId || that_present_workflowId) {
-        if (!(this_present_workflowId && that_present_workflowId))
+      boolean this_present_workflowTemplateId = true && this.isSetWorkflowTemplateId();
+      boolean that_present_workflowTemplateId = true && that.isSetWorkflowTemplateId();
+      if (this_present_workflowTemplateId || that_present_workflowTemplateId) {
+        if (!(this_present_workflowTemplateId && that_present_workflowTemplateId))
           return false;
-        if (!this.workflowId.equals(that.workflowId))
+        if (!this.workflowTemplateId.equals(that.workflowTemplateId))
           return false;
       }
 
@@ -250386,9 +250386,9 @@ public class Airavata {
       if (isSetAuthzToken())
         hashCode = hashCode * 8191 + authzToken.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetWorkflowId()) ? 131071 : 524287);
-      if (isSetWorkflowId())
-        hashCode = hashCode * 8191 + workflowId.hashCode();
+      hashCode = hashCode * 8191 + ((isSetWorkflowTemplateId()) ? 131071 : 524287);
+      if (isSetWorkflowTemplateId())
+        hashCode = hashCode * 8191 + workflowTemplateId.hashCode();
 
       return hashCode;
     }
@@ -250411,12 +250411,12 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetWorkflowId()).compareTo(other.isSetWorkflowId());
+      lastComparison = java.lang.Boolean.valueOf(isSetWorkflowTemplateId()).compareTo(other.isSetWorkflowTemplateId());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetWorkflowId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowId, other.workflowId);
+      if (isSetWorkflowTemplateId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowTemplateId, other.workflowTemplateId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -250449,11 +250449,11 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("workflowId:");
-      if (this.workflowId == null) {
+      sb.append("workflowTemplateId:");
+      if (this.workflowTemplateId == null) {
         sb.append("null");
       } else {
-        sb.append(this.workflowId);
+        sb.append(this.workflowTemplateId);
       }
       first = false;
       sb.append(")");
@@ -250465,8 +250465,8 @@ public class Airavata {
       if (authzToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
       }
-      if (workflowId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowId' was not present! Struct: " + toString());
+      if (workflowTemplateId == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowTemplateId' was not present! Struct: " + toString());
       }
       // check for sub-struct validity
       if (authzToken != null) {
@@ -250517,10 +250517,10 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // WORKFLOW_ID
+            case 2: // WORKFLOW_TEMPLATE_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.workflowId = iprot.readString();
-                struct.setWorkflowIdIsSet(true);
+                struct.workflowTemplateId = iprot.readString();
+                struct.setWorkflowTemplateIdIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -250545,9 +250545,9 @@ public class Airavata {
           struct.authzToken.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.workflowId != null) {
-          oprot.writeFieldBegin(WORKFLOW_ID_FIELD_DESC);
-          oprot.writeString(struct.workflowId);
+        if (struct.workflowTemplateId != null) {
+          oprot.writeFieldBegin(WORKFLOW_TEMPLATE_ID_FIELD_DESC);
+          oprot.writeString(struct.workflowTemplateId);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -250568,7 +250568,7 @@ public class Airavata {
       public void write(org.apache.thrift.protocol.TProtocol prot, getWorkflow_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
-        oprot.writeString(struct.workflowId);
+        oprot.writeString(struct.workflowTemplateId);
       }
 
       @Override
@@ -250577,8 +250577,8 @@ public class Airavata {
         struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
         struct.authzToken.read(iprot);
         struct.setAuthzTokenIsSet(true);
-        struct.workflowId = iprot.readString();
-        struct.setWorkflowIdIsSet(true);
+        struct.workflowTemplateId = iprot.readString();
+        struct.setWorkflowTemplateIdIsSet(true);
       }
     }
 
@@ -250599,7 +250599,7 @@ public class Airavata {
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getWorkflow_resultStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getWorkflow_resultTupleSchemeFactory();
 
-    public org.apache.airavata.model.workflow.AiravataWorkflow success; // required
+    public org.apache.airavata.model.WorkflowModel success; // required
     public org.apache.airavata.model.error.InvalidRequestException ire; // required
     public org.apache.airavata.model.error.AiravataClientException ace; // required
     public org.apache.airavata.model.error.AiravataSystemException ase; // required
@@ -250680,7 +250680,7 @@ public class Airavata {
     static {
       java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workflow.AiravataWorkflow.class)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.WorkflowModel.class)));
       tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.error.InvalidRequestException.class)));
       tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -250697,7 +250697,7 @@ public class Airavata {
     }
 
     public getWorkflow_result(
-      org.apache.airavata.model.workflow.AiravataWorkflow success,
+      org.apache.airavata.model.WorkflowModel success,
       org.apache.airavata.model.error.InvalidRequestException ire,
       org.apache.airavata.model.error.AiravataClientException ace,
       org.apache.airavata.model.error.AiravataSystemException ase,
@@ -250716,7 +250716,7 @@ public class Airavata {
      */
     public getWorkflow_result(getWorkflow_result other) {
       if (other.isSetSuccess()) {
-        this.success = new org.apache.airavata.model.workflow.AiravataWorkflow(other.success);
+        this.success = new org.apache.airavata.model.WorkflowModel(other.success);
       }
       if (other.isSetIre()) {
         this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
@@ -250745,11 +250745,11 @@ public class Airavata {
       this.ae = null;
     }
 
-    public org.apache.airavata.model.workflow.AiravataWorkflow getSuccess() {
+    public org.apache.airavata.model.WorkflowModel getSuccess() {
       return this.success;
     }
 
-    public getWorkflow_result setSuccess(org.apache.airavata.model.workflow.AiravataWorkflow success) {
+    public getWorkflow_result setSuccess(org.apache.airavata.model.WorkflowModel success) {
       this.success = success;
       return this;
     }
@@ -250871,7 +250871,7 @@ public class Airavata {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((org.apache.airavata.model.workflow.AiravataWorkflow)value);
+          setSuccess((org.apache.airavata.model.WorkflowModel)value);
         }
         break;
 
@@ -251207,7 +251207,7 @@ public class Airavata {
           switch (schemeField.id) {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.success = new org.apache.airavata.model.workflow.AiravataWorkflow();
+                struct.success = new org.apache.airavata.model.WorkflowModel();
                 struct.success.read(iprot);
                 struct.setSuccessIsSet(true);
               } else { 
@@ -251346,7 +251346,7 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
-          struct.success = new org.apache.airavata.model.workflow.AiravataWorkflow();
+          struct.success = new org.apache.airavata.model.WorkflowModel();
           struct.success.read(iprot);
           struct.setSuccessIsSet(true);
         }
@@ -251382,18 +251382,18 @@ public class Airavata {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("deleteWorkflow_args");
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField WORKFLOW_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowId", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField WORKFLOW_TEMPLATE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowTemplateId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteWorkflow_argsStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteWorkflow_argsTupleSchemeFactory();
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
-    public java.lang.String workflowId; // required
+    public java.lang.String workflowTemplateId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      WORKFLOW_ID((short)2, "workflowId");
+      WORKFLOW_TEMPLATE_ID((short)2, "workflowTemplateId");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
@@ -251410,8 +251410,8 @@ public class Airavata {
         switch(fieldId) {
           case 1: // AUTHZ_TOKEN
             return AUTHZ_TOKEN;
-          case 2: // WORKFLOW_ID
-            return WORKFLOW_ID;
+          case 2: // WORKFLOW_TEMPLATE_ID
+            return WORKFLOW_TEMPLATE_ID;
           default:
             return null;
         }
@@ -251457,7 +251457,7 @@ public class Airavata {
       java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
-      tmpMap.put(_Fields.WORKFLOW_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+      tmpMap.put(_Fields.WORKFLOW_TEMPLATE_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowTemplateId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteWorkflow_args.class, metaDataMap);
@@ -251468,11 +251468,11 @@ public class Airavata {
 
     public deleteWorkflow_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      java.lang.String workflowId)
+      java.lang.String workflowTemplateId)
     {
       this();
       this.authzToken = authzToken;
-      this.workflowId = workflowId;
+      this.workflowTemplateId = workflowTemplateId;
     }
 
     /**
@@ -251482,8 +251482,8 @@ public class Airavata {
       if (other.isSetAuthzToken()) {
         this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
-      if (other.isSetWorkflowId()) {
-        this.workflowId = other.workflowId;
+      if (other.isSetWorkflowTemplateId()) {
+        this.workflowTemplateId = other.workflowTemplateId;
       }
     }
 
@@ -251494,7 +251494,7 @@ public class Airavata {
     @Override
     public void clear() {
       this.authzToken = null;
-      this.workflowId = null;
+      this.workflowTemplateId = null;
     }
 
     public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -251521,27 +251521,27 @@ public class Airavata {
       }
     }
 
-    public java.lang.String getWorkflowId() {
-      return this.workflowId;
+    public java.lang.String getWorkflowTemplateId() {
+      return this.workflowTemplateId;
     }
 
-    public deleteWorkflow_args setWorkflowId(java.lang.String workflowId) {
-      this.workflowId = workflowId;
+    public deleteWorkflow_args setWorkflowTemplateId(java.lang.String workflowTemplateId) {
+      this.workflowTemplateId = workflowTemplateId;
       return this;
     }
 
-    public void unsetWorkflowId() {
-      this.workflowId = null;
+    public void unsetWorkflowTemplateId() {
+      this.workflowTemplateId = null;
     }
 
-    /** Returns true if field workflowId is set (has been assigned a value) and false otherwise */
-    public boolean isSetWorkflowId() {
-      return this.workflowId != null;
+    /** Returns true if field workflowTemplateId is set (has been assigned a value) and false otherwise */
+    public boolean isSetWorkflowTemplateId() {
+      return this.workflowTemplateId != null;
     }
 
-    public void setWorkflowIdIsSet(boolean value) {
+    public void setWorkflowTemplateIdIsSet(boolean value) {
       if (!value) {
-        this.workflowId = null;
+        this.workflowTemplateId = null;
       }
     }
 
@@ -251555,11 +251555,11 @@ public class Airavata {
         }
         break;
 
-      case WORKFLOW_ID:
+      case WORKFLOW_TEMPLATE_ID:
         if (value == null) {
-          unsetWorkflowId();
+          unsetWorkflowTemplateId();
         } else {
-          setWorkflowId((java.lang.String)value);
+          setWorkflowTemplateId((java.lang.String)value);
         }
         break;
 
@@ -251571,8 +251571,8 @@ public class Airavata {
       case AUTHZ_TOKEN:
         return getAuthzToken();
 
-      case WORKFLOW_ID:
-        return getWorkflowId();
+      case WORKFLOW_TEMPLATE_ID:
+        return getWorkflowTemplateId();
 
       }
       throw new java.lang.IllegalStateException();
@@ -251587,8 +251587,8 @@ public class Airavata {
       switch (field) {
       case AUTHZ_TOKEN:
         return isSetAuthzToken();
-      case WORKFLOW_ID:
-        return isSetWorkflowId();
+      case WORKFLOW_TEMPLATE_ID:
+        return isSetWorkflowTemplateId();
       }
       throw new java.lang.IllegalStateException();
     }
@@ -251617,12 +251617,12 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_workflowId = true && this.isSetWorkflowId();
-      boolean that_present_workflowId = true && that.isSetWorkflowId();
-      if (this_present_workflowId || that_present_workflowId) {
-        if (!(this_present_workflowId && that_present_workflowId))
+      boolean this_present_workflowTemplateId = true && this.isSetWorkflowTemplateId();
+      boolean that_present_workflowTemplateId = true && that.isSetWorkflowTemplateId();
+      if (this_present_workflowTemplateId || that_present_workflowTemplateId) {
+        if (!(this_present_workflowTemplateId && that_present_workflowTemplateId))
           return false;
-        if (!this.workflowId.equals(that.workflowId))
+        if (!this.workflowTemplateId.equals(that.workflowTemplateId))
           return false;
       }
 
@@ -251637,9 +251637,9 @@ public class Airavata {
       if (isSetAuthzToken())
         hashCode = hashCode * 8191 + authzToken.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetWorkflowId()) ? 131071 : 524287);
-      if (isSetWorkflowId())
-        hashCode = hashCode * 8191 + workflowId.hashCode();
+      hashCode = hashCode * 8191 + ((isSetWorkflowTemplateId()) ? 131071 : 524287);
+      if (isSetWorkflowTemplateId())
+        hashCode = hashCode * 8191 + workflowTemplateId.hashCode();
 
       return hashCode;
     }
@@ -251662,12 +251662,12 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetWorkflowId()).compareTo(other.isSetWorkflowId());
+      lastComparison = java.lang.Boolean.valueOf(isSetWorkflowTemplateId()).compareTo(other.isSetWorkflowTemplateId());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetWorkflowId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowId, other.workflowId);
+      if (isSetWorkflowTemplateId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowTemplateId, other.workflowTemplateId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -251700,11 +251700,11 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("workflowId:");
-      if (this.workflowId == null) {
+      sb.append("workflowTemplateId:");
+      if (this.workflowTemplateId == null) {
         sb.append("null");
       } else {
-        sb.append(this.workflowId);
+        sb.append(this.workflowTemplateId);
       }
       first = false;
       sb.append(")");
@@ -251716,8 +251716,8 @@ public class Airavata {
       if (authzToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
       }
-      if (workflowId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowId' was not present! Struct: " + toString());
+      if (workflowTemplateId == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowTemplateId' was not present! Struct: " + toString());
       }
       // check for sub-struct validity
       if (authzToken != null) {
@@ -251768,10 +251768,10 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // WORKFLOW_ID
+            case 2: // WORKFLOW_TEMPLATE_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.workflowId = iprot.readString();
-                struct.setWorkflowIdIsSet(true);
+                struct.workflowTemplateId = iprot.readString();
+                struct.setWorkflowTemplateIdIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -251796,9 +251796,9 @@ public class Airavata {
           struct.authzToken.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.workflowId != null) {
-          oprot.writeFieldBegin(WORKFLOW_ID_FIELD_DESC);
-          oprot.writeString(struct.workflowId);
+        if (struct.workflowTemplateId != null) {
+          oprot.writeFieldBegin(WORKFLOW_TEMPLATE_ID_FIELD_DESC);
+          oprot.writeString(struct.workflowTemplateId);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -251819,7 +251819,7 @@ public class Airavata {
       public void write(org.apache.thrift.protocol.TProtocol prot, deleteWorkflow_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
-        oprot.writeString(struct.workflowId);
+        oprot.writeString(struct.workflowTemplateId);
       }
 
       @Override
@@ -251828,8 +251828,8 @@ public class Airavata {
         struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
         struct.authzToken.read(iprot);
         struct.setAuthzTokenIsSet(true);
-        struct.workflowId = iprot.readString();
-        struct.setWorkflowIdIsSet(true);
+        struct.workflowTemplateId = iprot.readString();
+        struct.setWorkflowTemplateIdIsSet(true);
       }
     }
 
@@ -252532,7 +252532,7 @@ public class Airavata {
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String gatewayId; // required
-    public org.apache.airavata.model.workflow.AiravataWorkflow workflow; // required
+    public org.apache.airavata.model.WorkflowModel workflow; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -252607,7 +252607,7 @@ public class Airavata {
       tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.WORKFLOW, new org.apache.thrift.meta_data.FieldMetaData("workflow", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workflow.AiravataWorkflow.class)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.WorkflowModel.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerWorkflow_args.class, metaDataMap);
     }
@@ -252618,7 +252618,7 @@ public class Airavata {
     public registerWorkflow_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String gatewayId,
-      org.apache.airavata.model.workflow.AiravataWorkflow workflow)
+      org.apache.airavata.model.WorkflowModel workflow)
     {
       this();
       this.authzToken = authzToken;
@@ -252637,7 +252637,7 @@ public class Airavata {
         this.gatewayId = other.gatewayId;
       }
       if (other.isSetWorkflow()) {
-        this.workflow = new org.apache.airavata.model.workflow.AiravataWorkflow(other.workflow);
+        this.workflow = new org.apache.airavata.model.WorkflowModel(other.workflow);
       }
     }
 
@@ -252700,11 +252700,11 @@ public class Airavata {
       }
     }
 
-    public org.apache.airavata.model.workflow.AiravataWorkflow getWorkflow() {
+    public org.apache.airavata.model.WorkflowModel getWorkflow() {
       return this.workflow;
     }
 
-    public registerWorkflow_args setWorkflow(org.apache.airavata.model.workflow.AiravataWorkflow workflow) {
+    public registerWorkflow_args setWorkflow(org.apache.airavata.model.WorkflowModel workflow) {
       this.workflow = workflow;
       return this;
     }
@@ -252746,7 +252746,7 @@ public class Airavata {
         if (value == null) {
           unsetWorkflow();
         } else {
-          setWorkflow((org.apache.airavata.model.workflow.AiravataWorkflow)value);
+          setWorkflow((org.apache.airavata.model.WorkflowModel)value);
         }
         break;
 
@@ -253007,7 +253007,7 @@ public class Airavata {
               break;
             case 3: // WORKFLOW
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.workflow = new org.apache.airavata.model.workflow.AiravataWorkflow();
+                struct.workflow = new org.apache.airavata.model.WorkflowModel();
                 struct.workflow.read(iprot);
                 struct.setWorkflowIsSet(true);
               } else { 
@@ -253074,7 +253074,7 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.gatewayId = iprot.readString();
         struct.setGatewayIdIsSet(true);
-        struct.workflow = new org.apache.airavata.model.workflow.AiravataWorkflow();
+        struct.workflow = new org.apache.airavata.model.WorkflowModel();
         struct.workflow.read(iprot);
         struct.setWorkflowIsSet(true);
       }
@@ -253875,20 +253875,20 @@ public class Airavata {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateWorkflow_args");
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField WORKFLOW_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowId", org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField WORKFLOW_TEMPLATE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowTemplateId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField WORKFLOW_FIELD_DESC = new org.apache.thrift.protocol.TField("workflow", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateWorkflow_argsStandardSchemeFactory();
     private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateWorkflow_argsTupleSchemeFactory();
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
-    public java.lang.String workflowId; // required
-    public org.apache.airavata.model.workflow.AiravataWorkflow workflow; // required
+    public java.lang.String workflowTemplateId; // required
+    public org.apache.airavata.model.WorkflowModel workflow; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      WORKFLOW_ID((short)2, "workflowId"),
+      WORKFLOW_TEMPLATE_ID((short)2, "workflowTemplateId"),
       WORKFLOW((short)3, "workflow");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -253906,8 +253906,8 @@ public class Airavata {
         switch(fieldId) {
           case 1: // AUTHZ_TOKEN
             return AUTHZ_TOKEN;
-          case 2: // WORKFLOW_ID
-            return WORKFLOW_ID;
+          case 2: // WORKFLOW_TEMPLATE_ID
+            return WORKFLOW_TEMPLATE_ID;
           case 3: // WORKFLOW
             return WORKFLOW;
           default:
@@ -253955,10 +253955,10 @@ public class Airavata {
       java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTHZ_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authzToken", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
-      tmpMap.put(_Fields.WORKFLOW_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+      tmpMap.put(_Fields.WORKFLOW_TEMPLATE_ID, new org.apache.thrift.meta_data.FieldMetaData("workflowTemplateId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.WORKFLOW, new org.apache.thrift.meta_data.FieldMetaData("workflow", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workflow.AiravataWorkflow.class)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.WorkflowModel.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateWorkflow_args.class, metaDataMap);
     }
@@ -253968,12 +253968,12 @@ public class Airavata {
 
     public updateWorkflow_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      java.lang.String workflowId,
-      org.apache.airavata.model.workflow.AiravataWorkflow workflow)
+      java.lang.String workflowTemplateId,
+      org.apache.airavata.model.WorkflowModel workflow)
     {
       this();
       this.authzToken = authzToken;
-      this.workflowId = workflowId;
+      this.workflowTemplateId = workflowTemplateId;
       this.workflow = workflow;
     }
 
@@ -253984,11 +253984,11 @@ public class Airavata {
       if (other.isSetAuthzToken()) {
         this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
-      if (other.isSetWorkflowId()) {
-        this.workflowId = other.workflowId;
+      if (other.isSetWorkflowTemplateId()) {
+        this.workflowTemplateId = other.workflowTemplateId;
       }
       if (other.isSetWorkflow()) {
-        this.workflow = new org.apache.airavata.model.workflow.AiravataWorkflow(other.workflow);
+        this.workflow = new org.apache.airavata.model.WorkflowModel(other.workflow);
       }
     }
 
@@ -253999,7 +253999,7 @@ public class Airavata {
     @Override
     public void clear() {
       this.authzToken = null;
-      this.workflowId = null;
+      this.workflowTemplateId = null;
       this.workflow = null;
     }
 
@@ -254027,35 +254027,35 @@ public class Airavata {
       }
     }
 
-    public java.lang.String getWorkflowId() {
-      return this.workflowId;
+    public java.lang.String getWorkflowTemplateId() {
+      return this.workflowTemplateId;
     }
 
-    public updateWorkflow_args setWorkflowId(java.lang.String workflowId) {
-      this.workflowId = workflowId;
+    public updateWorkflow_args setWorkflowTemplateId(java.lang.String workflowTemplateId) {
+      this.workflowTemplateId = workflowTemplateId;
       return this;
     }
 
-    public void unsetWorkflowId() {
-      this.workflowId = null;
+    public void unsetWorkflowTemplateId() {
+      this.workflowTemplateId = null;
     }
 
-    /** Returns true if field workflowId is set (has been assigned a value) and false otherwise */
-    public boolean isSetWorkflowId() {
-      return this.workflowId != null;
+    /** Returns true if field workflowTemplateId is set (has been assigned a value) and false otherwise */
+    public boolean isSetWorkflowTemplateId() {
+      return this.workflowTemplateId != null;
     }
 
-    public void setWorkflowIdIsSet(boolean value) {
+    public void setWorkflowTemplateIdIsSet(boolean value) {
       if (!value) {
-        this.workflowId = null;
+        this.workflowTemplateId = null;
       }
     }
 
-    public org.apache.airavata.model.workflow.AiravataWorkflow getWorkflow() {
+    public org.apache.airavata.model.WorkflowModel getWorkflow() {
       return this.workflow;
     }
 
-    public updateWorkflow_args setWorkflow(org.apache.airavata.model.workflow.AiravataWorkflow workflow) {
+    public updateWorkflow_args setWorkflow(org.apache.airavata.model.WorkflowModel workflow) {
       this.workflow = workflow;
       return this;
     }
@@ -254085,11 +254085,11 @@ public class Airavata {
         }
         break;
 
-      case WORKFLOW_ID:
+      case WORKFLOW_TEMPLATE_ID:
         if (value == null) {
-          unsetWorkflowId();
+          unsetWorkflowTemplateId();
         } else {
-          setWorkflowId((java.lang.String)value);
+          setWorkflowTemplateId((java.lang.String)value);
         }
         break;
 
@@ -254097,7 +254097,7 @@ public class Airavata {
         if (value == null) {
           unsetWorkflow();
         } else {
-          setWorkflow((org.apache.airavata.model.workflow.AiravataWorkflow)value);
+          setWorkflow((org.apache.airavata.model.WorkflowModel)value);
         }
         break;
 
@@ -254109,8 +254109,8 @@ public class Airavata {
       case AUTHZ_TOKEN:
         return getAuthzToken();
 
-      case WORKFLOW_ID:
-        return getWorkflowId();
+      case WORKFLOW_TEMPLATE_ID:
+        return getWorkflowTemplateId();
 
       case WORKFLOW:
         return getWorkflow();
@@ -254128,8 +254128,8 @@ public class Airavata {
       switch (field) {
       case AUTHZ_TOKEN:
         return isSetAuthzToken();
-      case WORKFLOW_ID:
-        return isSetWorkflowId();
+      case WORKFLOW_TEMPLATE_ID:
+        return isSetWorkflowTemplateId();
       case WORKFLOW:
         return isSetWorkflow();
       }
@@ -254160,12 +254160,12 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_workflowId = true && this.isSetWorkflowId();
-      boolean that_present_workflowId = true && that.isSetWorkflowId();
-      if (this_present_workflowId || that_present_workflowId) {
-        if (!(this_present_workflowId && that_present_workflowId))
+      boolean this_present_workflowTemplateId = true && this.isSetWorkflowTemplateId();
+      boolean that_present_workflowTemplateId = true && that.isSetWorkflowTemplateId();
+      if (this_present_workflowTemplateId || that_present_workflowTemplateId) {
+        if (!(this_present_workflowTemplateId && that_present_workflowTemplateId))
           return false;
-        if (!this.workflowId.equals(that.workflowId))
+        if (!this.workflowTemplateId.equals(that.workflowTemplateId))
           return false;
       }
 
@@ -254189,9 +254189,9 @@ public class Airavata {
       if (isSetAuthzToken())
         hashCode = hashCode * 8191 + authzToken.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetWorkflowId()) ? 131071 : 524287);
-      if (isSetWorkflowId())
-        hashCode = hashCode * 8191 + workflowId.hashCode();
+      hashCode = hashCode * 8191 + ((isSetWorkflowTemplateId()) ? 131071 : 524287);
+      if (isSetWorkflowTemplateId())
+        hashCode = hashCode * 8191 + workflowTemplateId.hashCode();
 
       hashCode = hashCode * 8191 + ((isSetWorkflow()) ? 131071 : 524287);
       if (isSetWorkflow())
@@ -254218,12 +254218,12 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetWorkflowId()).compareTo(other.isSetWorkflowId());
+      lastComparison = java.lang.Boolean.valueOf(isSetWorkflowTemplateId()).compareTo(other.isSetWorkflowTemplateId());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetWorkflowId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowId, other.workflowId);
+      if (isSetWorkflowTemplateId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.workflowTemplateId, other.workflowTemplateId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -254266,11 +254266,11 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("workflowId:");
-      if (this.workflowId == null) {
+      sb.append("workflowTemplateId:");
+      if (this.workflowTemplateId == null) {
         sb.append("null");
       } else {
-        sb.append(this.workflowId);
+        sb.append(this.workflowTemplateId);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -254290,8 +254290,8 @@ public class Airavata {
       if (authzToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'authzToken' was not present! Struct: " + toString());
       }
-      if (workflowId == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowId' was not present! Struct: " + toString());
+      if (workflowTemplateId == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflowTemplateId' was not present! Struct: " + toString());
       }
       if (workflow == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'workflow' was not present! Struct: " + toString());
@@ -254348,17 +254348,17 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // WORKFLOW_ID
+            case 2: // WORKFLOW_TEMPLATE_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.workflowId = iprot.readString();
-                struct.setWorkflowIdIsSet(true);
+                struct.workflowTemplateId = iprot.readString();
+                struct.setWorkflowTemplateIdIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
             case 3: // WORKFLOW
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.workflow = new org.apache.airavata.model.workflow.AiravataWorkflow();
+                struct.workflow = new org.apache.airavata.model.WorkflowModel();
                 struct.workflow.read(iprot);
                 struct.setWorkflowIsSet(true);
               } else { 
@@ -254385,9 +254385,9 @@ public class Airavata {
           struct.authzToken.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.workflowId != null) {
-          oprot.writeFieldBegin(WORKFLOW_ID_FIELD_DESC);
-          oprot.writeString(struct.workflowId);
+        if (struct.workflowTemplateId != null) {
+          oprot.writeFieldBegin(WORKFLOW_TEMPLATE_ID_FIELD_DESC);
+          oprot.writeString(struct.workflowTemplateId);
           oprot.writeFieldEnd();
         }
         if (struct.workflow != null) {
@@ -254413,7 +254413,7 @@ public class Airavata {
       public void write(org.apache.thrift.protocol.TProtocol prot, updateWorkflow_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
-        oprot.writeString(struct.workflowId);
+        oprot.writeString(struct.workflowTemplateId);
         struct.workflow.write(oprot);
       }
 
@@ -254423,9 +254423,9 @@ public class Airavata {
         struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
         struct.authzToken.read(iprot);
         struct.setAuthzTokenIsSet(true);
-        struct.workflowId = iprot.readString();
-        struct.setWorkflowIdIsSet(true);
-        struct.workflow = new org.apache.airavata.model.workflow.AiravataWorkflow();
+        struct.workflowTemplateId = iprot.readString();
+        struct.setWorkflowTemplateIdIsSet(true);
+        struct.workflow = new org.apache.airavata.model.WorkflowModel();
         struct.workflow.read(iprot);
         struct.setWorkflowIsSet(true);
       }
@@ -255118,14 +255118,14 @@ public class Airavata {
     }
   }
 
-  public static class getWorkflowId_args implements org.apache.thrift.TBase<getWorkflowId_args, getWorkflowId_args._Fields>, java.io.Serializable, Cloneable, Comparable<getWorkflowId_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getWorkflowId_args");
+  public static class getWorkflowTemplateId_args implements org.apache.thrift.TBase<getWorkflowTemplateId_args, getWorkflowTemplateId_args._Fields>, java.io.Serializable, Cloneable, Comparable<getWorkflowTemplateId_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getWorkflowTemplateId_args");
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField WORKFLOW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("workflowName", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getWorkflowId_argsStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getWorkflowId_argsTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getWorkflowTemplateId_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getWorkflowTemplateId_argsTupleSchemeFactory();
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String workflowName; // required
@@ -255200,13 +255200,13 @@ public class Airavata {
       tmpMap.put(_Fields.WORKFLOW_NAME, new org.apache.thrift.meta_data.FieldMetaData("workflowName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getWorkflowId_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getWorkflowTemplateId_args.class, metaDataMap);
     }
 
-    public getWorkflowId_args() {
+    public getWorkflowTemplateId_args() {
     }
 
-    public getWorkflowId_args(
+    public getWorkflowTemplateId_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String workflowName)
     {
@@ -255218,7 +255218,7 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getWorkflowId_args(getWorkflowId_args other) {
+    public getWorkflowTemplateId_args(getWorkflowTemplateId_args other) {
       if (other.isSetAuthzToken()) {
         this.authzToken = new org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
@@ -255227,8 +255227,8 @@ public class Airavata {
       }
     }
 
-    public getWorkflowId_args deepCopy() {
-      return new getWorkflowId_args(this);
+    public getWorkflowTemplateId_args deepCopy() {
+      return new getWorkflowTemplateId_args(this);
     }
 
     @Override
@@ -255241,7 +255241,7 @@ public class Airavata {
       return this.authzToken;
     }
 
-    public getWorkflowId_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+    public getWorkflowTemplateId_args setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
       this.authzToken = authzToken;
       return this;
     }
@@ -255265,7 +255265,7 @@ public class Airavata {
       return this.workflowName;
     }
 
-    public getWorkflowId_args setWorkflowName(java.lang.String workflowName) {
+    public getWorkflowTemplateId_args setWorkflowName(java.lang.String workflowName) {
       this.workflowName = workflowName;
       return this;
     }
@@ -255337,12 +255337,12 @@ public class Airavata {
     public boolean equals(java.lang.Object that) {
       if (that == null)
         return false;
-      if (that instanceof getWorkflowId_args)
-        return this.equals((getWorkflowId_args)that);
+      if (that instanceof getWorkflowTemplateId_args)
+        return this.equals((getWorkflowTemplateId_args)that);
       return false;
     }
 
-    public boolean equals(getWorkflowId_args that) {
+    public boolean equals(getWorkflowTemplateId_args that) {
       if (that == null)
         return false;
       if (this == that)
@@ -255385,7 +255385,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(getWorkflowId_args other) {
+    public int compareTo(getWorkflowTemplateId_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -255429,7 +255429,7 @@ public class Airavata {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("getWorkflowId_args(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getWorkflowTemplateId_args(");
       boolean first = true;
 
       sb.append("authzToken:");
@@ -255481,15 +255481,15 @@ public class Airavata {
       }
     }
 
-    private static class getWorkflowId_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      public getWorkflowId_argsStandardScheme getScheme() {
-        return new getWorkflowId_argsStandardScheme();
+    private static class getWorkflowTemplateId_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      public getWorkflowTemplateId_argsStandardScheme getScheme() {
+        return new getWorkflowTemplateId_argsStandardScheme();
       }
     }
 
-    private static class getWorkflowId_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getWorkflowId_args> {
+    private static class getWorkflowTemplateId_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getWorkflowTemplateId_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getWorkflowId_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getWorkflowTemplateId_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -255527,7 +255527,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getWorkflowId_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getWorkflowTemplateId_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -255547,23 +255547,23 @@ public class Airavata {
 
     }
 
-    private static class getWorkflowId_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      public getWorkflowId_argsTupleScheme getScheme() {
-        return new getWorkflowId_argsTupleScheme();
+    private static class getWorkflowTemplateId_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      public getWorkflowTemplateId_argsTupleScheme getScheme() {
+        return new getWorkflowTemplateId_argsTupleScheme();
       }
     }
 
-    private static class getWorkflowId_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getWorkflowId_args> {
+    private static class getWorkflowTemplateId_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getWorkflowTemplateId_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getWorkflowId_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getWorkflowTemplateId_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.workflowName);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getWorkflowId_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getWorkflowTemplateId_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken = new org.apache.airavata.model.security.AuthzToken();
         struct.authzToken.read(iprot);
@@ -255578,8 +255578,8 @@ public class Airavata {
     }
   }
 
-  public static class getWorkflowId_result implements org.apache.thrift.TBase<getWorkflowId_result, getWorkflowId_result._Fields>, java.io.Serializable, Cloneable, Comparable<getWorkflowId_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getWorkflowId_result");
+  public static class getWorkflowTemplateId_result implements org.apache.thrift.TBase<getWorkflowTemplateId_result, getWorkflowTemplateId_result._Fields>, java.io.Serializable, Cloneable, Comparable<getWorkflowTemplateId_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getWorkflowTemplateId_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
     private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -255587,8 +255587,8 @@ public class Airavata {
     private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField AE_FIELD_DESC = new org.apache.thrift.protocol.TField("ae", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getWorkflowId_resultStandardSchemeFactory();
-    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getWorkflowId_resultTupleSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getWorkflowTemplateId_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getWorkflowTemplateId_resultTupleSchemeFactory();
 
     public java.lang.String success; // required
     public org.apache.airavata.model.error.InvalidRequestException ire; // required
@@ -255681,13 +255681,13 @@ public class Airavata {
       tmpMap.put(_Fields.AE, new org.apache.thrift.meta_data.FieldMetaData("ae", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.error.AuthorizationException.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getWorkflowId_result.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getWorkflowTemplateId_result.class, metaDataMap);
     }
 
-    public getWorkflowId_result() {
+    public getWorkflowTemplateId_result() {
     }
 
-    public getWorkflowId_result(
+    public getWorkflowTemplateId_result(
       java.lang.String success,
       org.apache.airavata.model.error.InvalidRequestException ire,
       org.apache.airavata.model.error.AiravataClientException ace,
@@ -255705,7 +255705,7 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getWorkflowId_result(getWorkflowId_result other) {
+    public getWorkflowTemplateId_result(getWorkflowTemplateId_result other) {
       if (other.isSetSuccess()) {
         this.success = other.success;
       }
@@ -255723,8 +255723,8 @@ public class Airavata {
       }
     }
 
-    public getWorkflowId_result deepCopy() {
-      return new getWorkflowId_result(this);
+    public getWorkflowTemplateId_result deepCopy() {
+      return new getWorkflowTemplateId_result(this);
     }
 
     @Override
@@ -255740,7 +255740,7 @@ public class Airavata {
       return this.success;
     }
 
-    public getWorkflowId_result setSuccess(java.lang.String success) {
+    public getWorkflowTemplateId_result setSuccess(java.lang.String success) {
       this.success = success;
       return this;
     }
@@ -255764,7 +255764,7 @@ public class Airavata {
       return this.ire;
     }
 
-    public getWorkflowId_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+    public getWorkflowTemplateId_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -255788,7 +255788,7 @@ public class Airavata {
       return this.ace;
     }
 
-    public getWorkflowId_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+    public getWorkflowTemplateId_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
       this.ace = ace;
       return this;
     }
@@ -255812,7 +255812,7 @@ public class Airavata {
       return this.ase;
     }
 
-    public getWorkflowId_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+    public getWorkflowTemplateId_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
       this.ase = ase;
       return this;
     }
@@ -255836,7 +255836,7 @@ public class Airavata {
       return this.ae;
     }
 
-    public getWorkflowId_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
+    public getWorkflowTemplateId_result setAe(org.apache.airavata.model.error.AuthorizationException ae) {
       this.ae = ae;
       return this;
     }
@@ -255947,12 +255947,12 @@ public class Airavata {
     public boolean equals(java.lang.Object that) {
       if (that == null)
         return false;
-      if (that instanceof getWorkflowId_result)
-        return this.equals((getWorkflowId_result)that);
+      if (that instanceof getWorkflowTemplateId_result)
+        return this.equals((getWorkflowTemplateId_result)that);
       return false;
     }
 
-    public boolean equals(getWorkflowId_result that) {
+    public boolean equals(getWorkflowTemplateId_result that) {
       if (that == null)
         return false;
       if (this == that)
@@ -256034,7 +256034,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(getWorkflowId_result other) {
+    public int compareTo(getWorkflowTemplateId_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -256108,7 +256108,7 @@ public class Airavata {
 
     @Override
     public java.lang.String toString() {
-      java.lang.StringBuilder sb = new java.lang.StringBuilder("getWorkflowId_result(");
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getWorkflowTemplateId_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -256175,15 +256175,15 @@ public class Airavata {
       }
     }
 
-    private static class getWorkflowId_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      public getWorkflowId_resultStandardScheme getScheme() {
-        return new getWorkflowId_resultStandardScheme();
+    private static class getWorkflowTemplateId_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      public getWorkflowTemplateId_resultStandardScheme getScheme() {
+        return new getWorkflowTemplateId_resultStandardScheme();
       }
     }
 
-    private static class getWorkflowId_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getWorkflowId_result> {
+    private static class getWorkflowTemplateId_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getWorkflowTemplateId_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, getWorkflowId_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, getWorkflowTemplateId_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -256248,7 +256248,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, getWorkflowId_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, getWorkflowTemplateId_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -256283,16 +256283,16 @@ public class Airavata {
 
     }
 
-    private static class getWorkflowId_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-      public getWorkflowId_resultTupleScheme getScheme() {
-        return new getWorkflowId_resultTupleScheme();
+    private static class getWorkflowTemplateId_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+      public getWorkflowTemplateId_resultTupleScheme getScheme() {
+        return new getWorkflowTemplateId_resultTupleScheme();
       }
     }
 
-    private static class getWorkflowId_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getWorkflowId_result> {
+    private static class getWorkflowTemplateId_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getWorkflowTemplateId_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, getWorkflowId_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, getWorkflowTemplateId_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
@@ -256329,7 +256329,7 @@ public class Airavata {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, getWorkflowId_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, getWorkflowTemplateId_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/AiravataWorkflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/AiravataWorkflow.java
deleted file mode 100644
index cea433a..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/AiravataWorkflow.java
+++ /dev/null
@@ -1,2144 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
-public class AiravataWorkflow implements org.apache.thrift.TBase<AiravataWorkflow, AiravataWorkflow._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataWorkflow> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataWorkflow");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("userName", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField STORAGE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storageResourceId", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)6);
-  private static final org.apache.thrift.protocol.TField ENABLE_EMAIL_NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("enableEmailNotification", org.apache.thrift.protocol.TType.BOOL, (short)7);
-  private static final org.apache.thrift.protocol.TField NOTIFICATION_EMAILS_FIELD_DESC = new org.apache.thrift.protocol.TField("notificationEmails", org.apache.thrift.protocol.TType.LIST, (short)8);
-  private static final org.apache.thrift.protocol.TField APPLICATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("applications", org.apache.thrift.protocol.TType.LIST, (short)9);
-  private static final org.apache.thrift.protocol.TField HANDLERS_FIELD_DESC = new org.apache.thrift.protocol.TField("handlers", org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField CONNECTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("connections", org.apache.thrift.protocol.TType.LIST, (short)11);
-  private static final org.apache.thrift.protocol.TField STATUSES_FIELD_DESC = new org.apache.thrift.protocol.TField("statuses", org.apache.thrift.protocol.TType.LIST, (short)12);
-  private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)13);
-  private static final org.apache.thrift.protocol.TField CREATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("createdAt", org.apache.thrift.protocol.TType.I64, (short)14);
-  private static final org.apache.thrift.protocol.TField UPDATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedAt", org.apache.thrift.protocol.TType.I64, (short)15);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new AiravataWorkflowStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new AiravataWorkflowTupleSchemeFactory();
-
-  private java.lang.String id; // required
-  private java.lang.String name; // required
-  private java.lang.String gatewayId; // required
-  private java.lang.String userName; // required
-  private java.lang.String storageResourceId; // required
-  private java.lang.String description; // optional
-  private boolean enableEmailNotification; // optional
-  private java.util.List<NotificationEmail> notificationEmails; // optional
-  private java.util.List<org.apache.airavata.model.workflow.WorkflowApplication> applications; // optional
-  private java.util.List<org.apache.airavata.model.workflow.WorkflowHandler> handlers; // optional
-  private java.util.List<org.apache.airavata.model.workflow.WorkflowConnection> connections; // optional
-  private java.util.List<WorkflowStatus> statuses; // optional
-  private java.util.List<org.apache.airavata.model.commons.ErrorModel> errors; // optional
-  private long createdAt; // optional
-  private long updatedAt; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    ID((short)1, "id"),
-    NAME((short)2, "name"),
-    GATEWAY_ID((short)3, "gatewayId"),
-    USER_NAME((short)4, "userName"),
-    STORAGE_RESOURCE_ID((short)5, "storageResourceId"),
-    DESCRIPTION((short)6, "description"),
-    ENABLE_EMAIL_NOTIFICATION((short)7, "enableEmailNotification"),
-    NOTIFICATION_EMAILS((short)8, "notificationEmails"),
-    APPLICATIONS((short)9, "applications"),
-    HANDLERS((short)10, "handlers"),
-    CONNECTIONS((short)11, "connections"),
-    STATUSES((short)12, "statuses"),
-    ERRORS((short)13, "errors"),
-    CREATED_AT((short)14, "createdAt"),
-    UPDATED_AT((short)15, "updatedAt");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ID
-          return ID;
-        case 2: // NAME
-          return NAME;
-        case 3: // GATEWAY_ID
-          return GATEWAY_ID;
-        case 4: // USER_NAME
-          return USER_NAME;
-        case 5: // STORAGE_RESOURCE_ID
-          return STORAGE_RESOURCE_ID;
-        case 6: // DESCRIPTION
-          return DESCRIPTION;
-        case 7: // ENABLE_EMAIL_NOTIFICATION
-          return ENABLE_EMAIL_NOTIFICATION;
-        case 8: // NOTIFICATION_EMAILS
-          return NOTIFICATION_EMAILS;
-        case 9: // APPLICATIONS
-          return APPLICATIONS;
-        case 10: // HANDLERS
-          return HANDLERS;
-        case 11: // CONNECTIONS
-          return CONNECTIONS;
-        case 12: // STATUSES
-          return STATUSES;
-        case 13: // ERRORS
-          return ERRORS;
-        case 14: // CREATED_AT
-          return CREATED_AT;
-        case 15: // UPDATED_AT
-          return UPDATED_AT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 0;
-  private static final int __CREATEDAT_ISSET_ID = 1;
-  private static final int __UPDATEDAT_ISSET_ID = 2;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.DESCRIPTION,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.NOTIFICATION_EMAILS,_Fields.APPLICATIONS,_Fields.HANDLERS,_Fields.CONNECTIONS,_Fields.STATUSES,_Fields.ERRORS,_Fields.CREATED_AT,_Fields.UPDATED_AT};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("userName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.STORAGE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("storageResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.ENABLE_EMAIL_NOTIFICATION, new org.apache.thrift.meta_data.FieldMetaData("enableEmailNotification", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.NOTIFICATION_EMAILS, new org.apache.thrift.meta_data.FieldMetaData("notificationEmails", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NotificationEmail.class))));
-    tmpMap.put(_Fields.APPLICATIONS, new org.apache.thrift.meta_data.FieldMetaData("applications", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workflow.WorkflowApplication.class))));
-    tmpMap.put(_Fields.HANDLERS, new org.apache.thrift.meta_data.FieldMetaData("handlers", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workflow.WorkflowHandler.class))));
-    tmpMap.put(_Fields.CONNECTIONS, new org.apache.thrift.meta_data.FieldMetaData("connections", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.workflow.WorkflowConnection.class))));
-    tmpMap.put(_Fields.STATUSES, new org.apache.thrift.meta_data.FieldMetaData("statuses", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WorkflowStatus.class))));
-    tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class))));
-    tmpMap.put(_Fields.CREATED_AT, new org.apache.thrift.meta_data.FieldMetaData("createdAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.UPDATED_AT, new org.apache.thrift.meta_data.FieldMetaData("updatedAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AiravataWorkflow.class, metaDataMap);
-  }
-
-  public AiravataWorkflow() {
-    this.id = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public AiravataWorkflow(
-    java.lang.String id,
-    java.lang.String name,
-    java.lang.String gatewayId,
-    java.lang.String userName,
-    java.lang.String storageResourceId)
-  {
-    this();
-    this.id = id;
-    this.name = name;
-    this.gatewayId = gatewayId;
-    this.userName = userName;
-    this.storageResourceId = storageResourceId;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public AiravataWorkflow(AiravataWorkflow other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetId()) {
-      this.id = other.id;
-    }
-    if (other.isSetName()) {
-      this.name = other.name;
-    }
-    if (other.isSetGatewayId()) {
-      this.gatewayId = other.gatewayId;
-    }
-    if (other.isSetUserName()) {
-      this.userName = other.userName;
-    }
-    if (other.isSetStorageResourceId()) {
-      this.storageResourceId = other.storageResourceId;
-    }
-    if (other.isSetDescription()) {
-      this.description = other.description;
-    }
-    this.enableEmailNotification = other.enableEmailNotification;
-    if (other.isSetNotificationEmails()) {
-      java.util.List<NotificationEmail> __this__notificationEmails = new java.util.ArrayList<NotificationEmail>(other.notificationEmails.size());
-      for (NotificationEmail other_element : other.notificationEmails) {
-        __this__notificationEmails.add(new NotificationEmail(other_element));
-      }
-      this.notificationEmails = __this__notificationEmails;
-    }
-    if (other.isSetApplications()) {
-      java.util.List<org.apache.airavata.model.workflow.WorkflowApplication> __this__applications = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowApplication>(other.applications.size());
-      for (org.apache.airavata.model.workflow.WorkflowApplication other_element : other.applications) {
-        __this__applications.add(new org.apache.airavata.model.workflow.WorkflowApplication(other_element));
-      }
-      this.applications = __this__applications;
-    }
-    if (other.isSetHandlers()) {
-      java.util.List<org.apache.airavata.model.workflow.WorkflowHandler> __this__handlers = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowHandler>(other.handlers.size());
-      for (org.apache.airavata.model.workflow.WorkflowHandler other_element : other.handlers) {
-        __this__handlers.add(new org.apache.airavata.model.workflow.WorkflowHandler(other_element));
-      }
-      this.handlers = __this__handlers;
-    }
-    if (other.isSetConnections()) {
-      java.util.List<org.apache.airavata.model.workflow.WorkflowConnection> __this__connections = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowConnection>(other.connections.size());
-      for (org.apache.airavata.model.workflow.WorkflowConnection other_element : other.connections) {
-        __this__connections.add(new org.apache.airavata.model.workflow.WorkflowConnection(other_element));
-      }
-      this.connections = __this__connections;
-    }
-    if (other.isSetStatuses()) {
-      java.util.List<WorkflowStatus> __this__statuses = new java.util.ArrayList<WorkflowStatus>(other.statuses.size());
-      for (WorkflowStatus other_element : other.statuses) {
-        __this__statuses.add(new WorkflowStatus(other_element));
-      }
-      this.statuses = __this__statuses;
-    }
-    if (other.isSetErrors()) {
-      java.util.List<org.apache.airavata.model.commons.ErrorModel> __this__errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.errors.size());
-      for (org.apache.airavata.model.commons.ErrorModel other_element : other.errors) {
-        __this__errors.add(new org.apache.airavata.model.commons.ErrorModel(other_element));
-      }
-      this.errors = __this__errors;
-    }
-    this.createdAt = other.createdAt;
-    this.updatedAt = other.updatedAt;
-  }
-
-  public AiravataWorkflow deepCopy() {
-    return new AiravataWorkflow(this);
-  }
-
-  @Override
-  public void clear() {
-    this.id = "DO_NOT_SET_AT_CLIENTS";
-
-    this.name = null;
-    this.gatewayId = null;
-    this.userName = null;
-    this.storageResourceId = null;
-    this.description = null;
-    setEnableEmailNotificationIsSet(false);
-    this.enableEmailNotification = false;
-    this.notificationEmails = null;
-    this.applications = null;
-    this.handlers = null;
-    this.connections = null;
-    this.statuses = null;
-    this.errors = null;
-    setCreatedAtIsSet(false);
-    this.createdAt = 0;
-    setUpdatedAtIsSet(false);
-    this.updatedAt = 0;
-  }
-
-  public java.lang.String getId() {
-    return this.id;
-  }
-
-  public void setId(java.lang.String id) {
-    this.id = id;
-  }
-
-  public void unsetId() {
-    this.id = null;
-  }
-
-  /** Returns true if field id is set (has been assigned a value) and false otherwise */
-  public boolean isSetId() {
-    return this.id != null;
-  }
-
-  public void setIdIsSet(boolean value) {
-    if (!value) {
-      this.id = null;
-    }
-  }
-
-  public java.lang.String getName() {
-    return this.name;
-  }
-
-  public void setName(java.lang.String name) {
-    this.name = name;
-  }
-
-  public void unsetName() {
-    this.name = null;
-  }
-
-  /** Returns true if field name is set (has been assigned a value) and false otherwise */
-  public boolean isSetName() {
-    return this.name != null;
-  }
-
-  public void setNameIsSet(boolean value) {
-    if (!value) {
-      this.name = null;
-    }
-  }
-
-  public java.lang.String getGatewayId() {
-    return this.gatewayId;
-  }
-
-  public void setGatewayId(java.lang.String gatewayId) {
-    this.gatewayId = gatewayId;
-  }
-
-  public void unsetGatewayId() {
-    this.gatewayId = null;
-  }
-
-  /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
-  public boolean isSetGatewayId() {
-    return this.gatewayId != null;
-  }
-
-  public void setGatewayIdIsSet(boolean value) {
-    if (!value) {
-      this.gatewayId = null;
-    }
-  }
-
-  public java.lang.String getUserName() {
-    return this.userName;
-  }
-
-  public void setUserName(java.lang.String userName) {
-    this.userName = userName;
-  }
-
-  public void unsetUserName() {
-    this.userName = null;
-  }
-
-  /** Returns true if field userName is set (has been assigned a value) and false otherwise */
-  public boolean isSetUserName() {
-    return this.userName != null;
-  }
-
-  public void setUserNameIsSet(boolean value) {
-    if (!value) {
-      this.userName = null;
-    }
-  }
-
-  public java.lang.String getStorageResourceId() {
-    return this.storageResourceId;
-  }
-
-  public void setStorageResourceId(java.lang.String storageResourceId) {
-    this.storageResourceId = storageResourceId;
-  }
-
-  public void unsetStorageResourceId() {
-    this.storageResourceId = null;
-  }
-
-  /** Returns true if field storageResourceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetStorageResourceId() {
-    return this.storageResourceId != null;
-  }
-
-  public void setStorageResourceIdIsSet(boolean value) {
-    if (!value) {
-      this.storageResourceId = null;
-    }
-  }
-
-  public java.lang.String getDescription() {
-    return this.description;
-  }
-
-  public void setDescription(java.lang.String description) {
-    this.description = description;
-  }
-
-  public void unsetDescription() {
-    this.description = null;
-  }
-
-  /** Returns true if field description is set (has been assigned a value) and false otherwise */
-  public boolean isSetDescription() {
-    return this.description != null;
-  }
-
-  public void setDescriptionIsSet(boolean value) {
-    if (!value) {
-      this.description = null;
-    }
-  }
-
-  public boolean isEnableEmailNotification() {
-    return this.enableEmailNotification;
-  }
-
-  public void setEnableEmailNotification(boolean enableEmailNotification) {
-    this.enableEmailNotification = enableEmailNotification;
-    setEnableEmailNotificationIsSet(true);
-  }
-
-  public void unsetEnableEmailNotification() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENABLEEMAILNOTIFICATION_ISSET_ID);
-  }
-
-  /** Returns true if field enableEmailNotification is set (has been assigned a value) and false otherwise */
-  public boolean isSetEnableEmailNotification() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENABLEEMAILNOTIFICATION_ISSET_ID);
-  }
-
-  public void setEnableEmailNotificationIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENABLEEMAILNOTIFICATION_ISSET_ID, value);
-  }
-
-  public int getNotificationEmailsSize() {
-    return (this.notificationEmails == null) ? 0 : this.notificationEmails.size();
-  }
-
-  public java.util.Iterator<NotificationEmail> getNotificationEmailsIterator() {
-    return (this.notificationEmails == null) ? null : this.notificationEmails.iterator();
-  }
-
-  public void addToNotificationEmails(NotificationEmail elem) {
-    if (this.notificationEmails == null) {
-      this.notificationEmails = new java.util.ArrayList<NotificationEmail>();
-    }
-    this.notificationEmails.add(elem);
-  }
-
-  public java.util.List<NotificationEmail> getNotificationEmails() {
-    return this.notificationEmails;
-  }
-
-  public void setNotificationEmails(java.util.List<NotificationEmail> notificationEmails) {
-    this.notificationEmails = notificationEmails;
-  }
-
-  public void unsetNotificationEmails() {
-    this.notificationEmails = null;
-  }
-
-  /** Returns true if field notificationEmails is set (has been assigned a value) and false otherwise */
-  public boolean isSetNotificationEmails() {
-    return this.notificationEmails != null;
-  }
-
-  public void setNotificationEmailsIsSet(boolean value) {
-    if (!value) {
-      this.notificationEmails = null;
-    }
-  }
-
-  public int getApplicationsSize() {
-    return (this.applications == null) ? 0 : this.applications.size();
-  }
-
-  public java.util.Iterator<org.apache.airavata.model.workflow.WorkflowApplication> getApplicationsIterator() {
-    return (this.applications == null) ? null : this.applications.iterator();
-  }
-
-  public void addToApplications(org.apache.airavata.model.workflow.WorkflowApplication elem) {
-    if (this.applications == null) {
-      this.applications = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowApplication>();
-    }
-    this.applications.add(elem);
-  }
-
-  public java.util.List<org.apache.airavata.model.workflow.WorkflowApplication> getApplications() {
-    return this.applications;
-  }
-
-  public void setApplications(java.util.List<org.apache.airavata.model.workflow.WorkflowApplication> applications) {
-    this.applications = applications;
-  }
-
-  public void unsetApplications() {
-    this.applications = null;
-  }
-
-  /** Returns true if field applications is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplications() {
-    return this.applications != null;
-  }
-
-  public void setApplicationsIsSet(boolean value) {
-    if (!value) {
-      this.applications = null;
-    }
-  }
-
-  public int getHandlersSize() {
-    return (this.handlers == null) ? 0 : this.handlers.size();
-  }
-
-  public java.util.Iterator<org.apache.airavata.model.workflow.WorkflowHandler> getHandlersIterator() {
-    return (this.handlers == null) ? null : this.handlers.iterator();
-  }
-
-  public void addToHandlers(org.apache.airavata.model.workflow.WorkflowHandler elem) {
-    if (this.handlers == null) {
-      this.handlers = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowHandler>();
-    }
-    this.handlers.add(elem);
-  }
-
-  public java.util.List<org.apache.airavata.model.workflow.WorkflowHandler> getHandlers() {
-    return this.handlers;
-  }
-
-  public void setHandlers(java.util.List<org.apache.airavata.model.workflow.WorkflowHandler> handlers) {
-    this.handlers = handlers;
-  }
-
-  public void unsetHandlers() {
-    this.handlers = null;
-  }
-
-  /** Returns true if field handlers is set (has been assigned a value) and false otherwise */
-  public boolean isSetHandlers() {
-    return this.handlers != null;
-  }
-
-  public void setHandlersIsSet(boolean value) {
-    if (!value) {
-      this.handlers = null;
-    }
-  }
-
-  public int getConnectionsSize() {
-    return (this.connections == null) ? 0 : this.connections.size();
-  }
-
-  public java.util.Iterator<org.apache.airavata.model.workflow.WorkflowConnection> getConnectionsIterator() {
-    return (this.connections == null) ? null : this.connections.iterator();
-  }
-
-  public void addToConnections(org.apache.airavata.model.workflow.WorkflowConnection elem) {
-    if (this.connections == null) {
-      this.connections = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowConnection>();
-    }
-    this.connections.add(elem);
-  }
-
-  public java.util.List<org.apache.airavata.model.workflow.WorkflowConnection> getConnections() {
-    return this.connections;
-  }
-
-  public void setConnections(java.util.List<org.apache.airavata.model.workflow.WorkflowConnection> connections) {
-    this.connections = connections;
-  }
-
-  public void unsetConnections() {
-    this.connections = null;
-  }
-
-  /** Returns true if field connections is set (has been assigned a value) and false otherwise */
-  public boolean isSetConnections() {
-    return this.connections != null;
-  }
-
-  public void setConnectionsIsSet(boolean value) {
-    if (!value) {
-      this.connections = null;
-    }
-  }
-
-  public int getStatusesSize() {
-    return (this.statuses == null) ? 0 : this.statuses.size();
-  }
-
-  public java.util.Iterator<WorkflowStatus> getStatusesIterator() {
-    return (this.statuses == null) ? null : this.statuses.iterator();
-  }
-
-  public void addToStatuses(WorkflowStatus elem) {
-    if (this.statuses == null) {
-      this.statuses = new java.util.ArrayList<WorkflowStatus>();
-    }
-    this.statuses.add(elem);
-  }
-
-  public java.util.List<WorkflowStatus> getStatuses() {
-    return this.statuses;
-  }
-
-  public void setStatuses(java.util.List<WorkflowStatus> statuses) {
-    this.statuses = statuses;
-  }
-
-  public void unsetStatuses() {
-    this.statuses = null;
-  }
-
-  /** Returns true if field statuses is set (has been assigned a value) and false otherwise */
-  public boolean isSetStatuses() {
-    return this.statuses != null;
-  }
-
-  public void setStatusesIsSet(boolean value) {
-    if (!value) {
-      this.statuses = null;
-    }
-  }
-
-  public int getErrorsSize() {
-    return (this.errors == null) ? 0 : this.errors.size();
-  }
-
-  public java.util.Iterator<org.apache.airavata.model.commons.ErrorModel> getErrorsIterator() {
-    return (this.errors == null) ? null : this.errors.iterator();
-  }
-
-  public void addToErrors(org.apache.airavata.model.commons.ErrorModel elem) {
-    if (this.errors == null) {
-      this.errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>();
-    }
-    this.errors.add(elem);
-  }
-
-  public java.util.List<org.apache.airavata.model.commons.ErrorModel> getErrors() {
-    return this.errors;
-  }
-
-  public void setErrors(java.util.List<org.apache.airavata.model.commons.ErrorModel> errors) {
-    this.errors = errors;
-  }
-
-  public void unsetErrors() {
-    this.errors = null;
-  }
-
-  /** Returns true if field errors is set (has been assigned a value) and false otherwise */
-  public boolean isSetErrors() {
-    return this.errors != null;
-  }
-
-  public void setErrorsIsSet(boolean value) {
-    if (!value) {
-      this.errors = null;
-    }
-  }
-
-  public long getCreatedAt() {
-    return this.createdAt;
-  }
-
-  public void setCreatedAt(long createdAt) {
-    this.createdAt = createdAt;
-    setCreatedAtIsSet(true);
-  }
-
-  public void unsetCreatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field createdAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetCreatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATEDAT_ISSET_ID);
-  }
-
-  public void setCreatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATEDAT_ISSET_ID, value);
-  }
-
-  public long getUpdatedAt() {
-    return this.updatedAt;
-  }
-
-  public void setUpdatedAt(long updatedAt) {
-    this.updatedAt = updatedAt;
-    setUpdatedAtIsSet(true);
-  }
-
-  public void unsetUpdatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field updatedAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetUpdatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  public void setUpdatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATEDAT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, java.lang.Object value) {
-    switch (field) {
-    case ID:
-      if (value == null) {
-        unsetId();
-      } else {
-        setId((java.lang.String)value);
-      }
-      break;
-
-    case NAME:
-      if (value == null) {
-        unsetName();
-      } else {
-        setName((java.lang.String)value);
-      }
-      break;
-
-    case GATEWAY_ID:
-      if (value == null) {
-        unsetGatewayId();
-      } else {
-        setGatewayId((java.lang.String)value);
-      }
-      break;
-
-    case USER_NAME:
-      if (value == null) {
-        unsetUserName();
-      } else {
-        setUserName((java.lang.String)value);
-      }
-      break;
-
-    case STORAGE_RESOURCE_ID:
-      if (value == null) {
-        unsetStorageResourceId();
-      } else {
-        setStorageResourceId((java.lang.String)value);
-      }
-      break;
-
-    case DESCRIPTION:
-      if (value == null) {
-        unsetDescription();
-      } else {
-        setDescription((java.lang.String)value);
-      }
-      break;
-
-    case ENABLE_EMAIL_NOTIFICATION:
-      if (value == null) {
-        unsetEnableEmailNotification();
-      } else {
-        setEnableEmailNotification((java.lang.Boolean)value);
-      }
-      break;
-
-    case NOTIFICATION_EMAILS:
-      if (value == null) {
-        unsetNotificationEmails();
-      } else {
-        setNotificationEmails((java.util.List<NotificationEmail>)value);
-      }
-      break;
-
-    case APPLICATIONS:
-      if (value == null) {
-        unsetApplications();
-      } else {
-        setApplications((java.util.List<org.apache.airavata.model.workflow.WorkflowApplication>)value);
-      }
-      break;
-
-    case HANDLERS:
-      if (value == null) {
-        unsetHandlers();
-      } else {
-        setHandlers((java.util.List<org.apache.airavata.model.workflow.WorkflowHandler>)value);
-      }
-      break;
-
-    case CONNECTIONS:
-      if (value == null) {
-        unsetConnections();
-      } else {
-        setConnections((java.util.List<org.apache.airavata.model.workflow.WorkflowConnection>)value);
-      }
-      break;
-
-    case STATUSES:
-      if (value == null) {
-        unsetStatuses();
-      } else {
-        setStatuses((java.util.List<WorkflowStatus>)value);
-      }
-      break;
-
-    case ERRORS:
-      if (value == null) {
-        unsetErrors();
-      } else {
-        setErrors((java.util.List<org.apache.airavata.model.commons.ErrorModel>)value);
-      }
-      break;
-
-    case CREATED_AT:
-      if (value == null) {
-        unsetCreatedAt();
-      } else {
-        setCreatedAt((java.lang.Long)value);
-      }
-      break;
-
-    case UPDATED_AT:
-      if (value == null) {
-        unsetUpdatedAt();
-      } else {
-        setUpdatedAt((java.lang.Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ID:
-      return getId();
-
-    case NAME:
-      return getName();
-
-    case GATEWAY_ID:
-      return getGatewayId();
-
-    case USER_NAME:
-      return getUserName();
-
-    case STORAGE_RESOURCE_ID:
-      return getStorageResourceId();
-
-    case DESCRIPTION:
-      return getDescription();
-
-    case ENABLE_EMAIL_NOTIFICATION:
-      return isEnableEmailNotification();
-
-    case NOTIFICATION_EMAILS:
-      return getNotificationEmails();
-
-    case APPLICATIONS:
-      return getApplications();
-
-    case HANDLERS:
-      return getHandlers();
-
-    case CONNECTIONS:
-      return getConnections();
-
-    case STATUSES:
-      return getStatuses();
-
-    case ERRORS:
-      return getErrors();
-
-    case CREATED_AT:
-      return getCreatedAt();
-
-    case UPDATED_AT:
-      return getUpdatedAt();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case ID:
-      return isSetId();
-    case NAME:
-      return isSetName();
-    case GATEWAY_ID:
-      return isSetGatewayId();
-    case USER_NAME:
-      return isSetUserName();
-    case STORAGE_RESOURCE_ID:
-      return isSetStorageResourceId();
-    case DESCRIPTION:
-      return isSetDescription();
-    case ENABLE_EMAIL_NOTIFICATION:
-      return isSetEnableEmailNotification();
-    case NOTIFICATION_EMAILS:
-      return isSetNotificationEmails();
-    case APPLICATIONS:
-      return isSetApplications();
-    case HANDLERS:
-      return isSetHandlers();
-    case CONNECTIONS:
-      return isSetConnections();
-    case STATUSES:
-      return isSetStatuses();
-    case ERRORS:
-      return isSetErrors();
-    case CREATED_AT:
-      return isSetCreatedAt();
-    case UPDATED_AT:
-      return isSetUpdatedAt();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof AiravataWorkflow)
-      return this.equals((AiravataWorkflow)that);
-    return false;
-  }
-
-  public boolean equals(AiravataWorkflow that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_id = true && this.isSetId();
-    boolean that_present_id = true && that.isSetId();
-    if (this_present_id || that_present_id) {
-      if (!(this_present_id && that_present_id))
-        return false;
-      if (!this.id.equals(that.id))
-        return false;
-    }
-
-    boolean this_present_name = true && this.isSetName();
-    boolean that_present_name = true && that.isSetName();
-    if (this_present_name || that_present_name) {
-      if (!(this_present_name && that_present_name))
-        return false;
-      if (!this.name.equals(that.name))
-        return false;
-    }
-
-    boolean this_present_gatewayId = true && this.isSetGatewayId();
-    boolean that_present_gatewayId = true && that.isSetGatewayId();
-    if (this_present_gatewayId || that_present_gatewayId) {
-      if (!(this_present_gatewayId && that_present_gatewayId))
-        return false;
-      if (!this.gatewayId.equals(that.gatewayId))
-        return false;
-    }
-
-    boolean this_present_userName = true && this.isSetUserName();
-    boolean that_present_userName = true && that.isSetUserName();
-    if (this_present_userName || that_present_userName) {
-      if (!(this_present_userName && that_present_userName))
-        return false;
-      if (!this.userName.equals(that.userName))
-        return false;
-    }
-
-    boolean this_present_storageResourceId = true && this.isSetStorageResourceId();
-    boolean that_present_storageResourceId = true && that.isSetStorageResourceId();
-    if (this_present_storageResourceId || that_present_storageResourceId) {
-      if (!(this_present_storageResourceId && that_present_storageResourceId))
-        return false;
-      if (!this.storageResourceId.equals(that.storageResourceId))
-        return false;
-    }
-
-    boolean this_present_description = true && this.isSetDescription();
-    boolean that_present_description = true && that.isSetDescription();
-    if (this_present_description || that_present_description) {
-      if (!(this_present_description && that_present_description))
-        return false;
-      if (!this.description.equals(that.description))
-        return false;
-    }
-
-    boolean this_present_enableEmailNotification = true && this.isSetEnableEmailNotification();
-    boolean that_present_enableEmailNotification = true && that.isSetEnableEmailNotification();
-    if (this_present_enableEmailNotification || that_present_enableEmailNotification) {
-      if (!(this_present_enableEmailNotification && that_present_enableEmailNotification))
-        return false;
-      if (this.enableEmailNotification != that.enableEmailNotification)
-        return false;
-    }
-
-    boolean this_present_notificationEmails = true && this.isSetNotificationEmails();
-    boolean that_present_notificationEmails = true && that.isSetNotificationEmails();
-    if (this_present_notificationEmails || that_present_notificationEmails) {
-      if (!(this_present_notificationEmails && that_present_notificationEmails))
-        return false;
-      if (!this.notificationEmails.equals(that.notificationEmails))
-        return false;
-    }
-
-    boolean this_present_applications = true && this.isSetApplications();
-    boolean that_present_applications = true && that.isSetApplications();
-    if (this_present_applications || that_present_applications) {
-      if (!(this_present_applications && that_present_applications))
-        return false;
-      if (!this.applications.equals(that.applications))
-        return false;
-    }
-
-    boolean this_present_handlers = true && this.isSetHandlers();
-    boolean that_present_handlers = true && that.isSetHandlers();
-    if (this_present_handlers || that_present_handlers) {
-      if (!(this_present_handlers && that_present_handlers))
-        return false;
-      if (!this.handlers.equals(that.handlers))
-        return false;
-    }
-
-    boolean this_present_connections = true && this.isSetConnections();
-    boolean that_present_connections = true && that.isSetConnections();
-    if (this_present_connections || that_present_connections) {
-      if (!(this_present_connections && that_present_connections))
-        return false;
-      if (!this.connections.equals(that.connections))
-        return false;
-    }
-
-    boolean this_present_statuses = true && this.isSetStatuses();
-    boolean that_present_statuses = true && that.isSetStatuses();
-    if (this_present_statuses || that_present_statuses) {
-      if (!(this_present_statuses && that_present_statuses))
-        return false;
-      if (!this.statuses.equals(that.statuses))
-        return false;
-    }
-
-    boolean this_present_errors = true && this.isSetErrors();
-    boolean that_present_errors = true && that.isSetErrors();
-    if (this_present_errors || that_present_errors) {
-      if (!(this_present_errors && that_present_errors))
-        return false;
-      if (!this.errors.equals(that.errors))
-        return false;
-    }
-
-    boolean this_present_createdAt = true && this.isSetCreatedAt();
-    boolean that_present_createdAt = true && that.isSetCreatedAt();
-    if (this_present_createdAt || that_present_createdAt) {
-      if (!(this_present_createdAt && that_present_createdAt))
-        return false;
-      if (this.createdAt != that.createdAt)
-        return false;
-    }
-
-    boolean this_present_updatedAt = true && this.isSetUpdatedAt();
-    boolean that_present_updatedAt = true && that.isSetUpdatedAt();
-    if (this_present_updatedAt || that_present_updatedAt) {
-      if (!(this_present_updatedAt && that_present_updatedAt))
-        return false;
-      if (this.updatedAt != that.updatedAt)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetId()) ? 131071 : 524287);
-    if (isSetId())
-      hashCode = hashCode * 8191 + id.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
-    if (isSetName())
-      hashCode = hashCode * 8191 + name.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetGatewayId()) ? 131071 : 524287);
-    if (isSetGatewayId())
-      hashCode = hashCode * 8191 + gatewayId.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetUserName()) ? 131071 : 524287);
-    if (isSetUserName())
-      hashCode = hashCode * 8191 + userName.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetStorageResourceId()) ? 131071 : 524287);
-    if (isSetStorageResourceId())
-      hashCode = hashCode * 8191 + storageResourceId.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
-    if (isSetDescription())
-      hashCode = hashCode * 8191 + description.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetEnableEmailNotification()) ? 131071 : 524287);
-    if (isSetEnableEmailNotification())
-      hashCode = hashCode * 8191 + ((enableEmailNotification) ? 131071 : 524287);
-
-    hashCode = hashCode * 8191 + ((isSetNotificationEmails()) ? 131071 : 524287);
-    if (isSetNotificationEmails())
-      hashCode = hashCode * 8191 + notificationEmails.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetApplications()) ? 131071 : 524287);
-    if (isSetApplications())
-      hashCode = hashCode * 8191 + applications.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetHandlers()) ? 131071 : 524287);
-    if (isSetHandlers())
-      hashCode = hashCode * 8191 + handlers.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetConnections()) ? 131071 : 524287);
-    if (isSetConnections())
-      hashCode = hashCode * 8191 + connections.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetStatuses()) ? 131071 : 524287);
-    if (isSetStatuses())
-      hashCode = hashCode * 8191 + statuses.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetErrors()) ? 131071 : 524287);
-    if (isSetErrors())
-      hashCode = hashCode * 8191 + errors.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetCreatedAt()) ? 131071 : 524287);
-    if (isSetCreatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createdAt);
-
-    hashCode = hashCode * 8191 + ((isSetUpdatedAt()) ? 131071 : 524287);
-    if (isSetUpdatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updatedAt);
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(AiravataWorkflow other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGatewayId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetUserName()).compareTo(other.isSetUserName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUserName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userName, other.userName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetStorageResourceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storageResourceId, other.storageResourceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetEnableEmailNotification()).compareTo(other.isSetEnableEmailNotification());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetEnableEmailNotification()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.enableEmailNotification, other.enableEmailNotification);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetNotificationEmails()).compareTo(other.isSetNotificationEmails());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetNotificationEmails()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.notificationEmails, other.notificationEmails);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetApplications()).compareTo(other.isSetApplications());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplications()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applications, other.applications);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetHandlers()).compareTo(other.isSetHandlers());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHandlers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.handlers, other.handlers);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetConnections()).compareTo(other.isSetConnections());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetConnections()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.connections, other.connections);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetStatuses()).compareTo(other.isSetStatuses());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetStatuses()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statuses, other.statuses);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetErrors()).compareTo(other.isSetErrors());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetErrors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, other.errors);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetCreatedAt()).compareTo(other.isSetCreatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCreatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createdAt, other.createdAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetUpdatedAt()).compareTo(other.isSetUpdatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUpdatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updatedAt, other.updatedAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("AiravataWorkflow(");
-    boolean first = true;
-
-    sb.append("id:");
-    if (this.id == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.id);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("name:");
-    if (this.name == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.name);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("gatewayId:");
-    if (this.gatewayId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.gatewayId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("userName:");
-    if (this.userName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.userName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("storageResourceId:");
-    if (this.storageResourceId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.storageResourceId);
-    }
-    first = false;
-    if (isSetDescription()) {
-      if (!first) sb.append(", ");
-      sb.append("description:");
-      if (this.description == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.description);
-      }
-      first = false;
-    }
-    if (isSetEnableEmailNotification()) {
-      if (!first) sb.append(", ");
-      sb.append("enableEmailNotification:");
-      sb.append(this.enableEmailNotification);
-      first = false;
-    }
-    if (isSetNotificationEmails()) {
-      if (!first) sb.append(", ");
-      sb.append("notificationEmails:");
-      if (this.notificationEmails == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.notificationEmails);
-      }
-      first = false;
-    }
-    if (isSetApplications()) {
-      if (!first) sb.append(", ");
-      sb.append("applications:");
-      if (this.applications == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.applications);
-      }
-      first = false;
-    }
-    if (isSetHandlers()) {
-      if (!first) sb.append(", ");
-      sb.append("handlers:");
-      if (this.handlers == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.handlers);
-      }
-      first = false;
-    }
-    if (isSetConnections()) {
-      if (!first) sb.append(", ");
-      sb.append("connections:");
-      if (this.connections == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.connections);
-      }
-      first = false;
-    }
-    if (isSetStatuses()) {
-      if (!first) sb.append(", ");
-      sb.append("statuses:");
-      if (this.statuses == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.statuses);
-      }
-      first = false;
-    }
-    if (isSetErrors()) {
-      if (!first) sb.append(", ");
-      sb.append("errors:");
-      if (this.errors == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.errors);
-      }
-      first = false;
-    }
-    if (isSetCreatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("createdAt:");
-      sb.append(this.createdAt);
-      first = false;
-    }
-    if (isSetUpdatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("updatedAt:");
-      sb.append(this.updatedAt);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
-    }
-
-    if (!isSetName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
-    }
-
-    if (!isSetGatewayId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString());
-    }
-
-    if (!isSetUserName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'userName' is unset! Struct:" + toString());
-    }
-
-    if (!isSetStorageResourceId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'storageResourceId' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class AiravataWorkflowStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public AiravataWorkflowStandardScheme getScheme() {
-      return new AiravataWorkflowStandardScheme();
-    }
-  }
-
-  private static class AiravataWorkflowStandardScheme extends org.apache.thrift.scheme.StandardScheme<AiravataWorkflow> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, AiravataWorkflow struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.name = iprot.readString();
-              struct.setNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // GATEWAY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.gatewayId = iprot.readString();
-              struct.setGatewayIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // USER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.userName = iprot.readString();
-              struct.setUserNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // STORAGE_RESOURCE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.storageResourceId = iprot.readString();
-              struct.setStorageResourceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // ENABLE_EMAIL_NOTIFICATION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.enableEmailNotification = iprot.readBool();
-              struct.setEnableEmailNotificationIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // NOTIFICATION_EMAILS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.notificationEmails = new java.util.ArrayList<NotificationEmail>(_list0.size);
-                NotificationEmail _elem1;
-                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
-                {
-                  _elem1 = new NotificationEmail();
-                  _elem1.read(iprot);
-                  struct.notificationEmails.add(_elem1);
-                }
-                iprot.readListEnd();
-              }
-              struct.setNotificationEmailsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // APPLICATIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
-                struct.applications = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowApplication>(_list3.size);
-                org.apache.airavata.model.workflow.WorkflowApplication _elem4;
-                for (int _i5 = 0; _i5 < _list3.size; ++_i5)
-                {
-                  _elem4 = new org.apache.airavata.model.workflow.WorkflowApplication();
-                  _elem4.read(iprot);
-                  struct.applications.add(_elem4);
-                }
-                iprot.readListEnd();
-              }
-              struct.setApplicationsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // HANDLERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
-                struct.handlers = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowHandler>(_list6.size);
-                org.apache.airavata.model.workflow.WorkflowHandler _elem7;
-                for (int _i8 = 0; _i8 < _list6.size; ++_i8)
-                {
-                  _elem7 = new org.apache.airavata.model.workflow.WorkflowHandler();
-                  _elem7.read(iprot);
-                  struct.handlers.add(_elem7);
-                }
-                iprot.readListEnd();
-              }
-              struct.setHandlersIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // CONNECTIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
-                struct.connections = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowConnection>(_list9.size);
-                org.apache.airavata.model.workflow.WorkflowConnection _elem10;
-                for (int _i11 = 0; _i11 < _list9.size; ++_i11)
-                {
-                  _elem10 = new org.apache.airavata.model.workflow.WorkflowConnection();
-                  _elem10.read(iprot);
-                  struct.connections.add(_elem10);
-                }
-                iprot.readListEnd();
-              }
-              struct.setConnectionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // STATUSES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
-                struct.statuses = new java.util.ArrayList<WorkflowStatus>(_list12.size);
-                WorkflowStatus _elem13;
-                for (int _i14 = 0; _i14 < _list12.size; ++_i14)
-                {
-                  _elem13 = new WorkflowStatus();
-                  _elem13.read(iprot);
-                  struct.statuses.add(_elem13);
-                }
-                iprot.readListEnd();
-              }
-              struct.setStatusesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // ERRORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list15 = iprot.readListBegin();
-                struct.errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list15.size);
-                org.apache.airavata.model.commons.ErrorModel _elem16;
-                for (int _i17 = 0; _i17 < _list15.size; ++_i17)
-                {
-                  _elem16 = new org.apache.airavata.model.commons.ErrorModel();
-                  _elem16.read(iprot);
-                  struct.errors.add(_elem16);
-                }
-                iprot.readListEnd();
-              }
-              struct.setErrorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 14: // CREATED_AT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.createdAt = iprot.readI64();
-              struct.setCreatedAtIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 15: // UPDATED_AT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.updatedAt = iprot.readI64();
-              struct.setUpdatedAtIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, AiravataWorkflow struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.id != null) {
-        oprot.writeFieldBegin(ID_FIELD_DESC);
-        oprot.writeString(struct.id);
-        oprot.writeFieldEnd();
-      }
-      if (struct.name != null) {
-        oprot.writeFieldBegin(NAME_FIELD_DESC);
-        oprot.writeString(struct.name);
-        oprot.writeFieldEnd();
-      }
-      if (struct.gatewayId != null) {
-        oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
-        oprot.writeString(struct.gatewayId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.userName != null) {
-        oprot.writeFieldBegin(USER_NAME_FIELD_DESC);
-        oprot.writeString(struct.userName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.storageResourceId != null) {
-        oprot.writeFieldBegin(STORAGE_RESOURCE_ID_FIELD_DESC);
-        oprot.writeString(struct.storageResourceId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.description != null) {
-        if (struct.isSetDescription()) {
-          oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
-          oprot.writeString(struct.description);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetEnableEmailNotification()) {
-        oprot.writeFieldBegin(ENABLE_EMAIL_NOTIFICATION_FIELD_DESC);
-        oprot.writeBool(struct.enableEmailNotification);
-        oprot.writeFieldEnd();
-      }
-      if (struct.notificationEmails != null) {
-        if (struct.isSetNotificationEmails()) {
-          oprot.writeFieldBegin(NOTIFICATION_EMAILS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.notificationEmails.size()));
-            for (NotificationEmail _iter18 : struct.notificationEmails)
-            {
-              _iter18.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.applications != null) {
-        if (struct.isSetApplications()) {
-          oprot.writeFieldBegin(APPLICATIONS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.applications.size()));
-            for (org.apache.airavata.model.workflow.WorkflowApplication _iter19 : struct.applications)
-            {
-              _iter19.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.handlers != null) {
-        if (struct.isSetHandlers()) {
-          oprot.writeFieldBegin(HANDLERS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.handlers.size()));
-            for (org.apache.airavata.model.workflow.WorkflowHandler _iter20 : struct.handlers)
-            {
-              _iter20.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.connections != null) {
-        if (struct.isSetConnections()) {
-          oprot.writeFieldBegin(CONNECTIONS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.connections.size()));
-            for (org.apache.airavata.model.workflow.WorkflowConnection _iter21 : struct.connections)
-            {
-              _iter21.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.statuses != null) {
-        if (struct.isSetStatuses()) {
-          oprot.writeFieldBegin(STATUSES_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.statuses.size()));
-            for (WorkflowStatus _iter22 : struct.statuses)
-            {
-              _iter22.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.errors != null) {
-        if (struct.isSetErrors()) {
-          oprot.writeFieldBegin(ERRORS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.errors.size()));
-            for (org.apache.airavata.model.commons.ErrorModel _iter23 : struct.errors)
-            {
-              _iter23.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetCreatedAt()) {
-        oprot.writeFieldBegin(CREATED_AT_FIELD_DESC);
-        oprot.writeI64(struct.createdAt);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeFieldBegin(UPDATED_AT_FIELD_DESC);
-        oprot.writeI64(struct.updatedAt);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class AiravataWorkflowTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public AiravataWorkflowTupleScheme getScheme() {
-      return new AiravataWorkflowTupleScheme();
-    }
-  }
-
-  private static class AiravataWorkflowTupleScheme extends org.apache.thrift.scheme.TupleScheme<AiravataWorkflow> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, AiravataWorkflow struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      oprot.writeString(struct.id);
-      oprot.writeString(struct.name);
-      oprot.writeString(struct.gatewayId);
-      oprot.writeString(struct.userName);
-      oprot.writeString(struct.storageResourceId);
-      java.util.BitSet optionals = new java.util.BitSet();
-      if (struct.isSetDescription()) {
-        optionals.set(0);
-      }
-      if (struct.isSetEnableEmailNotification()) {
-        optionals.set(1);
-      }
-      if (struct.isSetNotificationEmails()) {
-        optionals.set(2);
-      }
-      if (struct.isSetApplications()) {
-        optionals.set(3);
-      }
-      if (struct.isSetHandlers()) {
-        optionals.set(4);
-      }
-      if (struct.isSetConnections()) {
-        optionals.set(5);
-      }
-      if (struct.isSetStatuses()) {
-        optionals.set(6);
-      }
-      if (struct.isSetErrors()) {
-        optionals.set(7);
-      }
-      if (struct.isSetCreatedAt()) {
-        optionals.set(8);
-      }
-      if (struct.isSetUpdatedAt()) {
-        optionals.set(9);
-      }
-      oprot.writeBitSet(optionals, 10);
-      if (struct.isSetDescription()) {
-        oprot.writeString(struct.description);
-      }
-      if (struct.isSetEnableEmailNotification()) {
-        oprot.writeBool(struct.enableEmailNotification);
-      }
-      if (struct.isSetNotificationEmails()) {
-        {
-          oprot.writeI32(struct.notificationEmails.size());
-          for (NotificationEmail _iter24 : struct.notificationEmails)
-          {
-            _iter24.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetApplications()) {
-        {
-          oprot.writeI32(struct.applications.size());
-          for (org.apache.airavata.model.workflow.WorkflowApplication _iter25 : struct.applications)
-          {
-            _iter25.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetHandlers()) {
-        {
-          oprot.writeI32(struct.handlers.size());
-          for (org.apache.airavata.model.workflow.WorkflowHandler _iter26 : struct.handlers)
-          {
-            _iter26.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetConnections()) {
-        {
-          oprot.writeI32(struct.connections.size());
-          for (org.apache.airavata.model.workflow.WorkflowConnection _iter27 : struct.connections)
-          {
-            _iter27.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetStatuses()) {
-        {
-          oprot.writeI32(struct.statuses.size());
-          for (WorkflowStatus _iter28 : struct.statuses)
-          {
-            _iter28.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetErrors()) {
-        {
-          oprot.writeI32(struct.errors.size());
-          for (org.apache.airavata.model.commons.ErrorModel _iter29 : struct.errors)
-          {
-            _iter29.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetCreatedAt()) {
-        oprot.writeI64(struct.createdAt);
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeI64(struct.updatedAt);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, AiravataWorkflow struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.id = iprot.readString();
-      struct.setIdIsSet(true);
-      struct.name = iprot.readString();
-      struct.setNameIsSet(true);
-      struct.gatewayId = iprot.readString();
-      struct.setGatewayIdIsSet(true);
-      struct.userName = iprot.readString();
-      struct.setUserNameIsSet(true);
-      struct.storageResourceId = iprot.readString();
-      struct.setStorageResourceIdIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(10);
-      if (incoming.get(0)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.enableEmailNotification = iprot.readBool();
-        struct.setEnableEmailNotificationIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TList _list30 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.notificationEmails = new java.util.ArrayList<NotificationEmail>(_list30.size);
-          NotificationEmail _elem31;
-          for (int _i32 = 0; _i32 < _list30.size; ++_i32)
-          {
-            _elem31 = new NotificationEmail();
-            _elem31.read(iprot);
-            struct.notificationEmails.add(_elem31);
-          }
-        }
-        struct.setNotificationEmailsIsSet(true);
-      }
-      if (incoming.get(3)) {
-        {
-          org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.applications = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowApplication>(_list33.size);
-          org.apache.airavata.model.workflow.WorkflowApplication _elem34;
-          for (int _i35 = 0; _i35 < _list33.size; ++_i35)
-          {
-            _elem34 = new org.apache.airavata.model.workflow.WorkflowApplication();
-            _elem34.read(iprot);
-            struct.applications.add(_elem34);
-          }
-        }
-        struct.setApplicationsIsSet(true);
-      }
-      if (incoming.get(4)) {
-        {
-          org.apache.thrift.protocol.TList _list36 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.handlers = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowHandler>(_list36.size);
-          org.apache.airavata.model.workflow.WorkflowHandler _elem37;
-          for (int _i38 = 0; _i38 < _list36.size; ++_i38)
-          {
-            _elem37 = new org.apache.airavata.model.workflow.WorkflowHandler();
-            _elem37.read(iprot);
-            struct.handlers.add(_elem37);
-          }
-        }
-        struct.setHandlersIsSet(true);
-      }
-      if (incoming.get(5)) {
-        {
-          org.apache.thrift.protocol.TList _list39 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.connections = new java.util.ArrayList<org.apache.airavata.model.workflow.WorkflowConnection>(_list39.size);
-          org.apache.airavata.model.workflow.WorkflowConnection _elem40;
-          for (int _i41 = 0; _i41 < _list39.size; ++_i41)
-          {
-            _elem40 = new org.apache.airavata.model.workflow.WorkflowConnection();
-            _elem40.read(iprot);
-            struct.connections.add(_elem40);
-          }
-        }
-        struct.setConnectionsIsSet(true);
-      }
-      if (incoming.get(6)) {
-        {
-          org.apache.thrift.protocol.TList _list42 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.statuses = new java.util.ArrayList<WorkflowStatus>(_list42.size);
-          WorkflowStatus _elem43;
-          for (int _i44 = 0; _i44 < _list42.size; ++_i44)
-          {
-            _elem43 = new WorkflowStatus();
-            _elem43.read(iprot);
-            struct.statuses.add(_elem43);
-          }
-        }
-        struct.setStatusesIsSet(true);
-      }
-      if (incoming.get(7)) {
-        {
-          org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list45.size);
-          org.apache.airavata.model.commons.ErrorModel _elem46;
-          for (int _i47 = 0; _i47 < _list45.size; ++_i47)
-          {
-            _elem46 = new org.apache.airavata.model.commons.ErrorModel();
-            _elem46.read(iprot);
-            struct.errors.add(_elem46);
-          }
-        }
-        struct.setErrorsIsSet(true);
-      }
-      if (incoming.get(8)) {
-        struct.createdAt = iprot.readI64();
-        struct.setCreatedAtIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.updatedAt = iprot.readI64();
-        struct.setUpdatedAtIsSet(true);
-      }
-    }
-  }
-
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-  }
-}
-
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationConfig.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationConfig.java
deleted file mode 100644
index 9140c1a..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationConfig.java
+++ /dev/null
@@ -1,885 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
-public class ApplicationConfig implements org.apache.thrift.TBase<ApplicationConfig, ApplicationConfig._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationConfig> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationConfig");
-
-  private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField QUEUE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("queue_name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField NODE_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("nodeCount", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField CORE_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("coreCount", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField WALL_TIME_LIMIT_FIELD_DESC = new org.apache.thrift.protocol.TField("wallTimeLimit", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField PHYSICAL_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("physicalMemory", org.apache.thrift.protocol.TType.I32, (short)6);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ApplicationConfigStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ApplicationConfigTupleSchemeFactory();
-
-  private java.lang.String computeResourceId; // optional
-  private java.lang.String queue_name; // optional
-  private int nodeCount; // optional
-  private int coreCount; // optional
-  private int wallTimeLimit; // optional
-  private int physicalMemory; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    COMPUTE_RESOURCE_ID((short)1, "computeResourceId"),
-    QUEUE_NAME((short)2, "queue_name"),
-    NODE_COUNT((short)3, "nodeCount"),
-    CORE_COUNT((short)4, "coreCount"),
-    WALL_TIME_LIMIT((short)5, "wallTimeLimit"),
-    PHYSICAL_MEMORY((short)6, "physicalMemory");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // COMPUTE_RESOURCE_ID
-          return COMPUTE_RESOURCE_ID;
-        case 2: // QUEUE_NAME
-          return QUEUE_NAME;
-        case 3: // NODE_COUNT
-          return NODE_COUNT;
-        case 4: // CORE_COUNT
-          return CORE_COUNT;
-        case 5: // WALL_TIME_LIMIT
-          return WALL_TIME_LIMIT;
-        case 6: // PHYSICAL_MEMORY
-          return PHYSICAL_MEMORY;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __NODECOUNT_ISSET_ID = 0;
-  private static final int __CORECOUNT_ISSET_ID = 1;
-  private static final int __WALLTIMELIMIT_ISSET_ID = 2;
-  private static final int __PHYSICALMEMORY_ISSET_ID = 3;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.COMPUTE_RESOURCE_ID,_Fields.QUEUE_NAME,_Fields.NODE_COUNT,_Fields.CORE_COUNT,_Fields.WALL_TIME_LIMIT,_Fields.PHYSICAL_MEMORY};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.QUEUE_NAME, new org.apache.thrift.meta_data.FieldMetaData("queue_name", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NODE_COUNT, new org.apache.thrift.meta_data.FieldMetaData("nodeCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.CORE_COUNT, new org.apache.thrift.meta_data.FieldMetaData("coreCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.WALL_TIME_LIMIT, new org.apache.thrift.meta_data.FieldMetaData("wallTimeLimit", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.PHYSICAL_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("physicalMemory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationConfig.class, metaDataMap);
-  }
-
-  public ApplicationConfig() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ApplicationConfig(ApplicationConfig other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetComputeResourceId()) {
-      this.computeResourceId = other.computeResourceId;
-    }
-    if (other.isSetQueue_name()) {
-      this.queue_name = other.queue_name;
-    }
-    this.nodeCount = other.nodeCount;
-    this.coreCount = other.coreCount;
-    this.wallTimeLimit = other.wallTimeLimit;
-    this.physicalMemory = other.physicalMemory;
-  }
-
-  public ApplicationConfig deepCopy() {
-    return new ApplicationConfig(this);
-  }
-
-  @Override
-  public void clear() {
-    this.computeResourceId = null;
-    this.queue_name = null;
-    setNodeCountIsSet(false);
-    this.nodeCount = 0;
-    setCoreCountIsSet(false);
-    this.coreCount = 0;
-    setWallTimeLimitIsSet(false);
-    this.wallTimeLimit = 0;
-    setPhysicalMemoryIsSet(false);
-    this.physicalMemory = 0;
-  }
-
-  public java.lang.String getComputeResourceId() {
-    return this.computeResourceId;
-  }
-
-  public void setComputeResourceId(java.lang.String computeResourceId) {
-    this.computeResourceId = computeResourceId;
-  }
-
-  public void unsetComputeResourceId() {
-    this.computeResourceId = null;
-  }
-
-  /** Returns true if field computeResourceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetComputeResourceId() {
-    return this.computeResourceId != null;
-  }
-
-  public void setComputeResourceIdIsSet(boolean value) {
-    if (!value) {
-      this.computeResourceId = null;
-    }
-  }
-
-  public java.lang.String getQueue_name() {
-    return this.queue_name;
-  }
-
-  public void setQueue_name(java.lang.String queue_name) {
-    this.queue_name = queue_name;
-  }
-
-  public void unsetQueue_name() {
-    this.queue_name = null;
-  }
-
-  /** Returns true if field queue_name is set (has been assigned a value) and false otherwise */
-  public boolean isSetQueue_name() {
-    return this.queue_name != null;
-  }
-
-  public void setQueue_nameIsSet(boolean value) {
-    if (!value) {
-      this.queue_name = null;
-    }
-  }
-
-  public int getNodeCount() {
-    return this.nodeCount;
-  }
-
-  public void setNodeCount(int nodeCount) {
-    this.nodeCount = nodeCount;
-    setNodeCountIsSet(true);
-  }
-
-  public void unsetNodeCount() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NODECOUNT_ISSET_ID);
-  }
-
-  /** Returns true if field nodeCount is set (has been assigned a value) and false otherwise */
-  public boolean isSetNodeCount() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NODECOUNT_ISSET_ID);
-  }
-
-  public void setNodeCountIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NODECOUNT_ISSET_ID, value);
-  }
-
-  public int getCoreCount() {
-    return this.coreCount;
-  }
-
-  public void setCoreCount(int coreCount) {
-    this.coreCount = coreCount;
-    setCoreCountIsSet(true);
-  }
-
-  public void unsetCoreCount() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CORECOUNT_ISSET_ID);
-  }
-
-  /** Returns true if field coreCount is set (has been assigned a value) and false otherwise */
-  public boolean isSetCoreCount() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CORECOUNT_ISSET_ID);
-  }
-
-  public void setCoreCountIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CORECOUNT_ISSET_ID, value);
-  }
-
-  public int getWallTimeLimit() {
-    return this.wallTimeLimit;
-  }
-
-  public void setWallTimeLimit(int wallTimeLimit) {
-    this.wallTimeLimit = wallTimeLimit;
-    setWallTimeLimitIsSet(true);
-  }
-
-  public void unsetWallTimeLimit() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WALLTIMELIMIT_ISSET_ID);
-  }
-
-  /** Returns true if field wallTimeLimit is set (has been assigned a value) and false otherwise */
-  public boolean isSetWallTimeLimit() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WALLTIMELIMIT_ISSET_ID);
-  }
-
-  public void setWallTimeLimitIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WALLTIMELIMIT_ISSET_ID, value);
-  }
-
-  public int getPhysicalMemory() {
-    return this.physicalMemory;
-  }
-
-  public void setPhysicalMemory(int physicalMemory) {
-    this.physicalMemory = physicalMemory;
-    setPhysicalMemoryIsSet(true);
-  }
-
-  public void unsetPhysicalMemory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PHYSICALMEMORY_ISSET_ID);
-  }
-
-  /** Returns true if field physicalMemory is set (has been assigned a value) and false otherwise */
-  public boolean isSetPhysicalMemory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PHYSICALMEMORY_ISSET_ID);
-  }
-
-  public void setPhysicalMemoryIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PHYSICALMEMORY_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, java.lang.Object value) {
-    switch (field) {
-    case COMPUTE_RESOURCE_ID:
-      if (value == null) {
-        unsetComputeResourceId();
-      } else {
-        setComputeResourceId((java.lang.String)value);
-      }
-      break;
-
-    case QUEUE_NAME:
-      if (value == null) {
-        unsetQueue_name();
-      } else {
-        setQueue_name((java.lang.String)value);
-      }
-      break;
-
-    case NODE_COUNT:
-      if (value == null) {
-        unsetNodeCount();
-      } else {
-        setNodeCount((java.lang.Integer)value);
-      }
-      break;
-
-    case CORE_COUNT:
-      if (value == null) {
-        unsetCoreCount();
-      } else {
-        setCoreCount((java.lang.Integer)value);
-      }
-      break;
-
-    case WALL_TIME_LIMIT:
-      if (value == null) {
-        unsetWallTimeLimit();
-      } else {
-        setWallTimeLimit((java.lang.Integer)value);
-      }
-      break;
-
-    case PHYSICAL_MEMORY:
-      if (value == null) {
-        unsetPhysicalMemory();
-      } else {
-        setPhysicalMemory((java.lang.Integer)value);
-      }
-      break;
-
-    }
-  }
-
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COMPUTE_RESOURCE_ID:
-      return getComputeResourceId();
-
-    case QUEUE_NAME:
-      return getQueue_name();
-
-    case NODE_COUNT:
-      return getNodeCount();
-
-    case CORE_COUNT:
-      return getCoreCount();
-
-    case WALL_TIME_LIMIT:
-      return getWallTimeLimit();
-
-    case PHYSICAL_MEMORY:
-      return getPhysicalMemory();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case COMPUTE_RESOURCE_ID:
-      return isSetComputeResourceId();
-    case QUEUE_NAME:
-      return isSetQueue_name();
-    case NODE_COUNT:
-      return isSetNodeCount();
-    case CORE_COUNT:
-      return isSetCoreCount();
-    case WALL_TIME_LIMIT:
-      return isSetWallTimeLimit();
-    case PHYSICAL_MEMORY:
-      return isSetPhysicalMemory();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ApplicationConfig)
-      return this.equals((ApplicationConfig)that);
-    return false;
-  }
-
-  public boolean equals(ApplicationConfig that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_computeResourceId = true && this.isSetComputeResourceId();
-    boolean that_present_computeResourceId = true && that.isSetComputeResourceId();
-    if (this_present_computeResourceId || that_present_computeResourceId) {
-      if (!(this_present_computeResourceId && that_present_computeResourceId))
-        return false;
-      if (!this.computeResourceId.equals(that.computeResourceId))
-        return false;
-    }
-
-    boolean this_present_queue_name = true && this.isSetQueue_name();
-    boolean that_present_queue_name = true && that.isSetQueue_name();
-    if (this_present_queue_name || that_present_queue_name) {
-      if (!(this_present_queue_name && that_present_queue_name))
-        return false;
-      if (!this.queue_name.equals(that.queue_name))
-        return false;
-    }
-
-    boolean this_present_nodeCount = true && this.isSetNodeCount();
-    boolean that_present_nodeCount = true && that.isSetNodeCount();
-    if (this_present_nodeCount || that_present_nodeCount) {
-      if (!(this_present_nodeCount && that_present_nodeCount))
-        return false;
-      if (this.nodeCount != that.nodeCount)
-        return false;
-    }
-
-    boolean this_present_coreCount = true && this.isSetCoreCount();
-    boolean that_present_coreCount = true && that.isSetCoreCount();
-    if (this_present_coreCount || that_present_coreCount) {
-      if (!(this_present_coreCount && that_present_coreCount))
-        return false;
-      if (this.coreCount != that.coreCount)
-        return false;
-    }
-
-    boolean this_present_wallTimeLimit = true && this.isSetWallTimeLimit();
-    boolean that_present_wallTimeLimit = true && that.isSetWallTimeLimit();
-    if (this_present_wallTimeLimit || that_present_wallTimeLimit) {
-      if (!(this_present_wallTimeLimit && that_present_wallTimeLimit))
-        return false;
-      if (this.wallTimeLimit != that.wallTimeLimit)
-        return false;
-    }
-
-    boolean this_present_physicalMemory = true && this.isSetPhysicalMemory();
-    boolean that_present_physicalMemory = true && that.isSetPhysicalMemory();
-    if (this_present_physicalMemory || that_present_physicalMemory) {
-      if (!(this_present_physicalMemory && that_present_physicalMemory))
-        return false;
-      if (this.physicalMemory != that.physicalMemory)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetComputeResourceId()) ? 131071 : 524287);
-    if (isSetComputeResourceId())
-      hashCode = hashCode * 8191 + computeResourceId.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetQueue_name()) ? 131071 : 524287);
-    if (isSetQueue_name())
-      hashCode = hashCode * 8191 + queue_name.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetNodeCount()) ? 131071 : 524287);
-    if (isSetNodeCount())
-      hashCode = hashCode * 8191 + nodeCount;
-
-    hashCode = hashCode * 8191 + ((isSetCoreCount()) ? 131071 : 524287);
-    if (isSetCoreCount())
-      hashCode = hashCode * 8191 + coreCount;
-
-    hashCode = hashCode * 8191 + ((isSetWallTimeLimit()) ? 131071 : 524287);
-    if (isSetWallTimeLimit())
-      hashCode = hashCode * 8191 + wallTimeLimit;
-
-    hashCode = hashCode * 8191 + ((isSetPhysicalMemory()) ? 131071 : 524287);
-    if (isSetPhysicalMemory())
-      hashCode = hashCode * 8191 + physicalMemory;
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(ApplicationConfig other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetComputeResourceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computeResourceId, other.computeResourceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetQueue_name()).compareTo(other.isSetQueue_name());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQueue_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queue_name, other.queue_name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetNodeCount()).compareTo(other.isSetNodeCount());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetNodeCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nodeCount, other.nodeCount);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetCoreCount()).compareTo(other.isSetCoreCount());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCoreCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.coreCount, other.coreCount);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetWallTimeLimit()).compareTo(other.isSetWallTimeLimit());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetWallTimeLimit()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wallTimeLimit, other.wallTimeLimit);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetPhysicalMemory()).compareTo(other.isSetPhysicalMemory());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPhysicalMemory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.physicalMemory, other.physicalMemory);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("ApplicationConfig(");
-    boolean first = true;
-
-    if (isSetComputeResourceId()) {
-      sb.append("computeResourceId:");
-      if (this.computeResourceId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.computeResourceId);
-      }
-      first = false;
-    }
-    if (isSetQueue_name()) {
-      if (!first) sb.append(", ");
-      sb.append("queue_name:");
-      if (this.queue_name == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.queue_name);
-      }
-      first = false;
-    }
-    if (isSetNodeCount()) {
-      if (!first) sb.append(", ");
-      sb.append("nodeCount:");
-      sb.append(this.nodeCount);
-      first = false;
-    }
-    if (isSetCoreCount()) {
-      if (!first) sb.append(", ");
-      sb.append("coreCount:");
-      sb.append(this.coreCount);
-      first = false;
-    }
-    if (isSetWallTimeLimit()) {
-      if (!first) sb.append(", ");
-      sb.append("wallTimeLimit:");
-      sb.append(this.wallTimeLimit);
-      first = false;
-    }
-    if (isSetPhysicalMemory()) {
-      if (!first) sb.append(", ");
-      sb.append("physicalMemory:");
-      sb.append(this.physicalMemory);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ApplicationConfigStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public ApplicationConfigStandardScheme getScheme() {
-      return new ApplicationConfigStandardScheme();
-    }
-  }
-
-  private static class ApplicationConfigStandardScheme extends org.apache.thrift.scheme.StandardScheme<ApplicationConfig> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ApplicationConfig struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // COMPUTE_RESOURCE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.computeResourceId = iprot.readString();
-              struct.setComputeResourceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // QUEUE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.queue_name = iprot.readString();
-              struct.setQueue_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // NODE_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.nodeCount = iprot.readI32();
-              struct.setNodeCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // CORE_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.coreCount = iprot.readI32();
-              struct.setCoreCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // WALL_TIME_LIMIT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.wallTimeLimit = iprot.readI32();
-              struct.setWallTimeLimitIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // PHYSICAL_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.physicalMemory = iprot.readI32();
-              struct.setPhysicalMemoryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ApplicationConfig struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.computeResourceId != null) {
-        if (struct.isSetComputeResourceId()) {
-          oprot.writeFieldBegin(COMPUTE_RESOURCE_ID_FIELD_DESC);
-          oprot.writeString(struct.computeResourceId);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.queue_name != null) {
-        if (struct.isSetQueue_name()) {
-          oprot.writeFieldBegin(QUEUE_NAME_FIELD_DESC);
-          oprot.writeString(struct.queue_name);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetNodeCount()) {
-        oprot.writeFieldBegin(NODE_COUNT_FIELD_DESC);
-        oprot.writeI32(struct.nodeCount);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetCoreCount()) {
-        oprot.writeFieldBegin(CORE_COUNT_FIELD_DESC);
-        oprot.writeI32(struct.coreCount);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetWallTimeLimit()) {
-        oprot.writeFieldBegin(WALL_TIME_LIMIT_FIELD_DESC);
-        oprot.writeI32(struct.wallTimeLimit);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetPhysicalMemory()) {
-        oprot.writeFieldBegin(PHYSICAL_MEMORY_FIELD_DESC);
-        oprot.writeI32(struct.physicalMemory);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ApplicationConfigTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public ApplicationConfigTupleScheme getScheme() {
-      return new ApplicationConfigTupleScheme();
-    }
-  }
-
-  private static class ApplicationConfigTupleScheme extends org.apache.thrift.scheme.TupleScheme<ApplicationConfig> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationConfig struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet optionals = new java.util.BitSet();
-      if (struct.isSetComputeResourceId()) {
-        optionals.set(0);
-      }
-      if (struct.isSetQueue_name()) {
-        optionals.set(1);
-      }
-      if (struct.isSetNodeCount()) {
-        optionals.set(2);
-      }
-      if (struct.isSetCoreCount()) {
-        optionals.set(3);
-      }
-      if (struct.isSetWallTimeLimit()) {
-        optionals.set(4);
-      }
-      if (struct.isSetPhysicalMemory()) {
-        optionals.set(5);
-      }
-      oprot.writeBitSet(optionals, 6);
-      if (struct.isSetComputeResourceId()) {
-        oprot.writeString(struct.computeResourceId);
-      }
-      if (struct.isSetQueue_name()) {
-        oprot.writeString(struct.queue_name);
-      }
-      if (struct.isSetNodeCount()) {
-        oprot.writeI32(struct.nodeCount);
-      }
-      if (struct.isSetCoreCount()) {
-        oprot.writeI32(struct.coreCount);
-      }
-      if (struct.isSetWallTimeLimit()) {
-        oprot.writeI32(struct.wallTimeLimit);
-      }
-      if (struct.isSetPhysicalMemory()) {
-        oprot.writeI32(struct.physicalMemory);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationConfig struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      java.util.BitSet incoming = iprot.readBitSet(6);
-      if (incoming.get(0)) {
-        struct.computeResourceId = iprot.readString();
-        struct.setComputeResourceIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.queue_name = iprot.readString();
-        struct.setQueue_nameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.nodeCount = iprot.readI32();
-        struct.setNodeCountIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.coreCount = iprot.readI32();
-        struct.setCoreCountIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.wallTimeLimit = iprot.readI32();
-        struct.setWallTimeLimitIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.physicalMemory = iprot.readI32();
-        struct.setPhysicalMemoryIsSet(true);
-      }
-    }
-  }
-
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-  }
-}
-
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationState.java
deleted file mode 100644
index b09baed..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationState.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum ApplicationState implements org.apache.thrift.TEnum {
-  CREATED(0),
-  VALIDATED(1),
-  SCHEDULED(2),
-  LAUNCHED(3),
-  EXECUTING(4),
-  CANCELING(5),
-  CANCELED(6),
-  COMPLETED(7),
-  FAILED(8);
-
-  private final int value;
-
-  private ApplicationState(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static ApplicationState findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return CREATED;
-      case 1:
-        return VALIDATED;
-      case 2:
-        return SCHEDULED;
-      case 3:
-        return LAUNCHED;
-      case 4:
-        return EXECUTING;
-      case 5:
-        return CANCELING;
-      case 6:
-        return CANCELED;
-      case 7:
-        return COMPLETED;
-      case 8:
-        return FAILED;
-      default:
-        return null;
-    }
-  }
-}
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationStatus.java
deleted file mode 100644
index 210a561..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/ApplicationStatus.java
+++ /dev/null
@@ -1,708 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
-public class ApplicationStatus implements org.apache.thrift.TBase<ApplicationStatus, ApplicationStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationStatus> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationStatus");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField UPDATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedAt", org.apache.thrift.protocol.TType.I64, (short)4);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ApplicationStatusStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ApplicationStatusTupleSchemeFactory();
-
-  private java.lang.String id; // optional
-  private ApplicationState state; // required
-  private java.lang.String description; // optional
-  private long updatedAt; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    ID((short)1, "id"),
-    /**
-     * 
-     * @see ApplicationState
-     */
-    STATE((short)2, "state"),
-    DESCRIPTION((short)3, "description"),
-    UPDATED_AT((short)4, "updatedAt");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ID
-          return ID;
-        case 2: // STATE
-          return STATE;
-        case 3: // DESCRIPTION
-          return DESCRIPTION;
-        case 4: // UPDATED_AT
-          return UPDATED_AT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __UPDATEDAT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ID,_Fields.DESCRIPTION,_Fields.UPDATED_AT};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ApplicationState.class)));
-    tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.UPDATED_AT, new org.apache.thrift.meta_data.FieldMetaData("updatedAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ApplicationStatus.class, metaDataMap);
-  }
-
-  public ApplicationStatus() {
-  }
-
-  public ApplicationStatus(
-    ApplicationState state)
-  {
-    this();
-    this.state = state;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ApplicationStatus(ApplicationStatus other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetId()) {
-      this.id = other.id;
-    }
-    if (other.isSetState()) {
-      this.state = other.state;
-    }
-    if (other.isSetDescription()) {
-      this.description = other.description;
-    }
-    this.updatedAt = other.updatedAt;
-  }
-
-  public ApplicationStatus deepCopy() {
-    return new ApplicationStatus(this);
-  }
-
-  @Override
-  public void clear() {
-    this.id = null;
-    this.state = null;
-    this.description = null;
-    setUpdatedAtIsSet(false);
-    this.updatedAt = 0;
-  }
-
-  public java.lang.String getId() {
-    return this.id;
-  }
-
-  public void setId(java.lang.String id) {
-    this.id = id;
-  }
-
-  public void unsetId() {
-    this.id = null;
-  }
-
-  /** Returns true if field id is set (has been assigned a value) and false otherwise */
-  public boolean isSetId() {
-    return this.id != null;
-  }
-
-  public void setIdIsSet(boolean value) {
-    if (!value) {
-      this.id = null;
-    }
-  }
-
-  /**
-   * 
-   * @see ApplicationState
-   */
-  public ApplicationState getState() {
-    return this.state;
-  }
-
-  /**
-   * 
-   * @see ApplicationState
-   */
-  public void setState(ApplicationState state) {
-    this.state = state;
-  }
-
-  public void unsetState() {
-    this.state = null;
-  }
-
-  /** Returns true if field state is set (has been assigned a value) and false otherwise */
-  public boolean isSetState() {
-    return this.state != null;
-  }
-
-  public void setStateIsSet(boolean value) {
-    if (!value) {
-      this.state = null;
-    }
-  }
-
-  public java.lang.String getDescription() {
-    return this.description;
-  }
-
-  public void setDescription(java.lang.String description) {
-    this.description = description;
-  }
-
-  public void unsetDescription() {
-    this.description = null;
-  }
-
-  /** Returns true if field description is set (has been assigned a value) and false otherwise */
-  public boolean isSetDescription() {
-    return this.description != null;
-  }
-
-  public void setDescriptionIsSet(boolean value) {
-    if (!value) {
-      this.description = null;
-    }
-  }
-
-  public long getUpdatedAt() {
-    return this.updatedAt;
-  }
-
-  public void setUpdatedAt(long updatedAt) {
-    this.updatedAt = updatedAt;
-    setUpdatedAtIsSet(true);
-  }
-
-  public void unsetUpdatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field updatedAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetUpdatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  public void setUpdatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATEDAT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, java.lang.Object value) {
-    switch (field) {
-    case ID:
-      if (value == null) {
-        unsetId();
-      } else {
-        setId((java.lang.String)value);
-      }
-      break;
-
-    case STATE:
-      if (value == null) {
-        unsetState();
-      } else {
-        setState((ApplicationState)value);
-      }
-      break;
-
-    case DESCRIPTION:
-      if (value == null) {
-        unsetDescription();
-      } else {
-        setDescription((java.lang.String)value);
-      }
-      break;
-
-    case UPDATED_AT:
-      if (value == null) {
-        unsetUpdatedAt();
-      } else {
-        setUpdatedAt((java.lang.Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ID:
-      return getId();
-
-    case STATE:
-      return getState();
-
-    case DESCRIPTION:
-      return getDescription();
-
-    case UPDATED_AT:
-      return getUpdatedAt();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case ID:
-      return isSetId();
-    case STATE:
-      return isSetState();
-    case DESCRIPTION:
-      return isSetDescription();
-    case UPDATED_AT:
-      return isSetUpdatedAt();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ApplicationStatus)
-      return this.equals((ApplicationStatus)that);
-    return false;
-  }
-
-  public boolean equals(ApplicationStatus that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_id = true && this.isSetId();
-    boolean that_present_id = true && that.isSetId();
-    if (this_present_id || that_present_id) {
-      if (!(this_present_id && that_present_id))
-        return false;
-      if (!this.id.equals(that.id))
-        return false;
-    }
-
-    boolean this_present_state = true && this.isSetState();
-    boolean that_present_state = true && that.isSetState();
-    if (this_present_state || that_present_state) {
-      if (!(this_present_state && that_present_state))
-        return false;
-      if (!this.state.equals(that.state))
-        return false;
-    }
-
-    boolean this_present_description = true && this.isSetDescription();
-    boolean that_present_description = true && that.isSetDescription();
-    if (this_present_description || that_present_description) {
-      if (!(this_present_description && that_present_description))
-        return false;
-      if (!this.description.equals(that.description))
-        return false;
-    }
-
-    boolean this_present_updatedAt = true && this.isSetUpdatedAt();
-    boolean that_present_updatedAt = true && that.isSetUpdatedAt();
-    if (this_present_updatedAt || that_present_updatedAt) {
-      if (!(this_present_updatedAt && that_present_updatedAt))
-        return false;
-      if (this.updatedAt != that.updatedAt)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetId()) ? 131071 : 524287);
-    if (isSetId())
-      hashCode = hashCode * 8191 + id.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetState()) ? 131071 : 524287);
-    if (isSetState())
-      hashCode = hashCode * 8191 + state.getValue();
-
-    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
-    if (isSetDescription())
-      hashCode = hashCode * 8191 + description.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetUpdatedAt()) ? 131071 : 524287);
-    if (isSetUpdatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updatedAt);
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(ApplicationStatus other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetState()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetUpdatedAt()).compareTo(other.isSetUpdatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUpdatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updatedAt, other.updatedAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("ApplicationStatus(");
-    boolean first = true;
-
-    if (isSetId()) {
-      sb.append("id:");
-      if (this.id == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.id);
-      }
-      first = false;
-    }
-    if (!first) sb.append(", ");
-    sb.append("state:");
-    if (this.state == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.state);
-    }
-    first = false;
-    if (isSetDescription()) {
-      if (!first) sb.append(", ");
-      sb.append("description:");
-      if (this.description == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.description);
-      }
-      first = false;
-    }
-    if (isSetUpdatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("updatedAt:");
-      sb.append(this.updatedAt);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetState()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'state' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ApplicationStatusStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public ApplicationStatusStandardScheme getScheme() {
-      return new ApplicationStatusStandardScheme();
-    }
-  }
-
-  private static class ApplicationStatusStandardScheme extends org.apache.thrift.scheme.StandardScheme<ApplicationStatus> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ApplicationStatus struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.airavata.model.workflow.ApplicationState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // UPDATED_AT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.updatedAt = iprot.readI64();
-              struct.setUpdatedAtIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, ApplicationStatus struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.id != null) {
-        if (struct.isSetId()) {
-          oprot.writeFieldBegin(ID_FIELD_DESC);
-          oprot.writeString(struct.id);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.state != null) {
-        oprot.writeFieldBegin(STATE_FIELD_DESC);
-        oprot.writeI32(struct.state.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.description != null) {
-        if (struct.isSetDescription()) {
-          oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
-          oprot.writeString(struct.description);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeFieldBegin(UPDATED_AT_FIELD_DESC);
-        oprot.writeI64(struct.updatedAt);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ApplicationStatusTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public ApplicationStatusTupleScheme getScheme() {
-      return new ApplicationStatusTupleScheme();
-    }
-  }
-
-  private static class ApplicationStatusTupleScheme extends org.apache.thrift.scheme.TupleScheme<ApplicationStatus> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationStatus struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      oprot.writeI32(struct.state.getValue());
-      java.util.BitSet optionals = new java.util.BitSet();
-      if (struct.isSetId()) {
-        optionals.set(0);
-      }
-      if (struct.isSetDescription()) {
-        optionals.set(1);
-      }
-      if (struct.isSetUpdatedAt()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetId()) {
-        oprot.writeString(struct.id);
-      }
-      if (struct.isSetDescription()) {
-        oprot.writeString(struct.description);
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeI64(struct.updatedAt);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationStatus struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.state = org.apache.airavata.model.workflow.ApplicationState.findByValue(iprot.readI32());
-      struct.setStateIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.id = iprot.readString();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.updatedAt = iprot.readI64();
-        struct.setUpdatedAtIsSet(true);
-      }
-    }
-  }
-
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-  }
-}
-
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerState.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerState.java
deleted file mode 100644
index 0abd1b2..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerState.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum HandlerState implements org.apache.thrift.TEnum {
-  CREATED(0),
-  VALIDATED(1),
-  SCHEDULED(2),
-  LAUNCHED(3),
-  EXECUTING(4),
-  CANCELING(5),
-  CANCELED(6),
-  COMPLETED(7),
-  FAILED(8);
-
-  private final int value;
-
-  private HandlerState(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static HandlerState findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return CREATED;
-      case 1:
-        return VALIDATED;
-      case 2:
-        return SCHEDULED;
-      case 3:
-        return LAUNCHED;
-      case 4:
-        return EXECUTING;
-      case 5:
-        return CANCELING;
-      case 6:
-        return CANCELED;
-      case 7:
-        return COMPLETED;
-      case 8:
-        return FAILED;
-      default:
-        return null;
-    }
-  }
-}
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerStatus.java
deleted file mode 100644
index 4d8eb59..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerStatus.java
+++ /dev/null
@@ -1,708 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
-public class HandlerStatus implements org.apache.thrift.TBase<HandlerStatus, HandlerStatus._Fields>, java.io.Serializable, Cloneable, Comparable<HandlerStatus> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HandlerStatus");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField UPDATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedAt", org.apache.thrift.protocol.TType.I64, (short)4);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new HandlerStatusStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new HandlerStatusTupleSchemeFactory();
-
-  private java.lang.String id; // optional
-  private HandlerState state; // required
-  private java.lang.String description; // optional
-  private long updatedAt; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    ID((short)1, "id"),
-    /**
-     * 
-     * @see HandlerState
-     */
-    STATE((short)2, "state"),
-    DESCRIPTION((short)3, "description"),
-    UPDATED_AT((short)4, "updatedAt");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ID
-          return ID;
-        case 2: // STATE
-          return STATE;
-        case 3: // DESCRIPTION
-          return DESCRIPTION;
-        case 4: // UPDATED_AT
-          return UPDATED_AT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __UPDATEDAT_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ID,_Fields.DESCRIPTION,_Fields.UPDATED_AT};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, HandlerState.class)));
-    tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.UPDATED_AT, new org.apache.thrift.meta_data.FieldMetaData("updatedAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HandlerStatus.class, metaDataMap);
-  }
-
-  public HandlerStatus() {
-  }
-
-  public HandlerStatus(
-    HandlerState state)
-  {
-    this();
-    this.state = state;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public HandlerStatus(HandlerStatus other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetId()) {
-      this.id = other.id;
-    }
-    if (other.isSetState()) {
-      this.state = other.state;
-    }
-    if (other.isSetDescription()) {
-      this.description = other.description;
-    }
-    this.updatedAt = other.updatedAt;
-  }
-
-  public HandlerStatus deepCopy() {
-    return new HandlerStatus(this);
-  }
-
-  @Override
-  public void clear() {
-    this.id = null;
-    this.state = null;
-    this.description = null;
-    setUpdatedAtIsSet(false);
-    this.updatedAt = 0;
-  }
-
-  public java.lang.String getId() {
-    return this.id;
-  }
-
-  public void setId(java.lang.String id) {
-    this.id = id;
-  }
-
-  public void unsetId() {
-    this.id = null;
-  }
-
-  /** Returns true if field id is set (has been assigned a value) and false otherwise */
-  public boolean isSetId() {
-    return this.id != null;
-  }
-
-  public void setIdIsSet(boolean value) {
-    if (!value) {
-      this.id = null;
-    }
-  }
-
-  /**
-   * 
-   * @see HandlerState
-   */
-  public HandlerState getState() {
-    return this.state;
-  }
-
-  /**
-   * 
-   * @see HandlerState
-   */
-  public void setState(HandlerState state) {
-    this.state = state;
-  }
-
-  public void unsetState() {
-    this.state = null;
-  }
-
-  /** Returns true if field state is set (has been assigned a value) and false otherwise */
-  public boolean isSetState() {
-    return this.state != null;
-  }
-
-  public void setStateIsSet(boolean value) {
-    if (!value) {
-      this.state = null;
-    }
-  }
-
-  public java.lang.String getDescription() {
-    return this.description;
-  }
-
-  public void setDescription(java.lang.String description) {
-    this.description = description;
-  }
-
-  public void unsetDescription() {
-    this.description = null;
-  }
-
-  /** Returns true if field description is set (has been assigned a value) and false otherwise */
-  public boolean isSetDescription() {
-    return this.description != null;
-  }
-
-  public void setDescriptionIsSet(boolean value) {
-    if (!value) {
-      this.description = null;
-    }
-  }
-
-  public long getUpdatedAt() {
-    return this.updatedAt;
-  }
-
-  public void setUpdatedAt(long updatedAt) {
-    this.updatedAt = updatedAt;
-    setUpdatedAtIsSet(true);
-  }
-
-  public void unsetUpdatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field updatedAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetUpdatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  public void setUpdatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATEDAT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, java.lang.Object value) {
-    switch (field) {
-    case ID:
-      if (value == null) {
-        unsetId();
-      } else {
-        setId((java.lang.String)value);
-      }
-      break;
-
-    case STATE:
-      if (value == null) {
-        unsetState();
-      } else {
-        setState((HandlerState)value);
-      }
-      break;
-
-    case DESCRIPTION:
-      if (value == null) {
-        unsetDescription();
-      } else {
-        setDescription((java.lang.String)value);
-      }
-      break;
-
-    case UPDATED_AT:
-      if (value == null) {
-        unsetUpdatedAt();
-      } else {
-        setUpdatedAt((java.lang.Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ID:
-      return getId();
-
-    case STATE:
-      return getState();
-
-    case DESCRIPTION:
-      return getDescription();
-
-    case UPDATED_AT:
-      return getUpdatedAt();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case ID:
-      return isSetId();
-    case STATE:
-      return isSetState();
-    case DESCRIPTION:
-      return isSetDescription();
-    case UPDATED_AT:
-      return isSetUpdatedAt();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof HandlerStatus)
-      return this.equals((HandlerStatus)that);
-    return false;
-  }
-
-  public boolean equals(HandlerStatus that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_id = true && this.isSetId();
-    boolean that_present_id = true && that.isSetId();
-    if (this_present_id || that_present_id) {
-      if (!(this_present_id && that_present_id))
-        return false;
-      if (!this.id.equals(that.id))
-        return false;
-    }
-
-    boolean this_present_state = true && this.isSetState();
-    boolean that_present_state = true && that.isSetState();
-    if (this_present_state || that_present_state) {
-      if (!(this_present_state && that_present_state))
-        return false;
-      if (!this.state.equals(that.state))
-        return false;
-    }
-
-    boolean this_present_description = true && this.isSetDescription();
-    boolean that_present_description = true && that.isSetDescription();
-    if (this_present_description || that_present_description) {
-      if (!(this_present_description && that_present_description))
-        return false;
-      if (!this.description.equals(that.description))
-        return false;
-    }
-
-    boolean this_present_updatedAt = true && this.isSetUpdatedAt();
-    boolean that_present_updatedAt = true && that.isSetUpdatedAt();
-    if (this_present_updatedAt || that_present_updatedAt) {
-      if (!(this_present_updatedAt && that_present_updatedAt))
-        return false;
-      if (this.updatedAt != that.updatedAt)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetId()) ? 131071 : 524287);
-    if (isSetId())
-      hashCode = hashCode * 8191 + id.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetState()) ? 131071 : 524287);
-    if (isSetState())
-      hashCode = hashCode * 8191 + state.getValue();
-
-    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
-    if (isSetDescription())
-      hashCode = hashCode * 8191 + description.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetUpdatedAt()) ? 131071 : 524287);
-    if (isSetUpdatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updatedAt);
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(HandlerStatus other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetState()).compareTo(other.isSetState());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetState()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetUpdatedAt()).compareTo(other.isSetUpdatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUpdatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updatedAt, other.updatedAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("HandlerStatus(");
-    boolean first = true;
-
-    if (isSetId()) {
-      sb.append("id:");
-      if (this.id == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.id);
-      }
-      first = false;
-    }
-    if (!first) sb.append(", ");
-    sb.append("state:");
-    if (this.state == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.state);
-    }
-    first = false;
-    if (isSetDescription()) {
-      if (!first) sb.append(", ");
-      sb.append("description:");
-      if (this.description == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.description);
-      }
-      first = false;
-    }
-    if (isSetUpdatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("updatedAt:");
-      sb.append(this.updatedAt);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetState()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'state' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class HandlerStatusStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public HandlerStatusStandardScheme getScheme() {
-      return new HandlerStatusStandardScheme();
-    }
-  }
-
-  private static class HandlerStatusStandardScheme extends org.apache.thrift.scheme.StandardScheme<HandlerStatus> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HandlerStatus struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // STATE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = org.apache.airavata.model.workflow.HandlerState.findByValue(iprot.readI32());
-              struct.setStateIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // DESCRIPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.description = iprot.readString();
-              struct.setDescriptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // UPDATED_AT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.updatedAt = iprot.readI64();
-              struct.setUpdatedAtIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, HandlerStatus struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.id != null) {
-        if (struct.isSetId()) {
-          oprot.writeFieldBegin(ID_FIELD_DESC);
-          oprot.writeString(struct.id);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.state != null) {
-        oprot.writeFieldBegin(STATE_FIELD_DESC);
-        oprot.writeI32(struct.state.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.description != null) {
-        if (struct.isSetDescription()) {
-          oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
-          oprot.writeString(struct.description);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeFieldBegin(UPDATED_AT_FIELD_DESC);
-        oprot.writeI64(struct.updatedAt);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class HandlerStatusTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public HandlerStatusTupleScheme getScheme() {
-      return new HandlerStatusTupleScheme();
-    }
-  }
-
-  private static class HandlerStatusTupleScheme extends org.apache.thrift.scheme.TupleScheme<HandlerStatus> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HandlerStatus struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      oprot.writeI32(struct.state.getValue());
-      java.util.BitSet optionals = new java.util.BitSet();
-      if (struct.isSetId()) {
-        optionals.set(0);
-      }
-      if (struct.isSetDescription()) {
-        optionals.set(1);
-      }
-      if (struct.isSetUpdatedAt()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetId()) {
-        oprot.writeString(struct.id);
-      }
-      if (struct.isSetDescription()) {
-        oprot.writeString(struct.description);
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeI64(struct.updatedAt);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HandlerStatus struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.state = org.apache.airavata.model.workflow.HandlerState.findByValue(iprot.readI32());
-      struct.setStateIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.id = iprot.readString();
-        struct.setIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.description = iprot.readString();
-        struct.setDescriptionIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.updatedAt = iprot.readI64();
-        struct.setUpdatedAtIsSet(true);
-      }
-    }
-  }
-
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-  }
-}
-
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerType.java
deleted file mode 100644
index 2fb0303..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/HandlerType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum HandlerType implements org.apache.thrift.TEnum {
-  FLOW_STARTER(0),
-  FLOW_TERMINATOR(1),
-  DOWHILE_LOOP(2),
-  FOREACH_LOOP(3);
-
-  private final int value;
-
-  private HandlerType(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static HandlerType findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return FLOW_STARTER;
-      case 1:
-        return FLOW_TERMINATOR;
-      case 2:
-        return DOWHILE_LOOP;
-      case 3:
-        return FOREACH_LOOP;
-      default:
-        return null;
-    }
-  }
-}
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/NotificationEmail.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/NotificationEmail.java
deleted file mode 100644
index 096aff0..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/NotificationEmail.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
-public class NotificationEmail implements org.apache.thrift.TBase<NotificationEmail, NotificationEmail._Fields>, java.io.Serializable, Cloneable, Comparable<NotificationEmail> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotificationEmail");
-
-  private static final org.apache.thrift.protocol.TField EMAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("email", org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NotificationEmailStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NotificationEmailTupleSchemeFactory();
-
-  private java.lang.String email; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    EMAIL((short)1, "email");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // EMAIL
-          return EMAIL;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.EMAIL, new org.apache.thrift.meta_data.FieldMetaData("email", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotificationEmail.class, metaDataMap);
-  }
-
-  public NotificationEmail() {
-  }
-
-  public NotificationEmail(
-    java.lang.String email)
-  {
-    this();
-    this.email = email;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public NotificationEmail(NotificationEmail other) {
-    if (other.isSetEmail()) {
-      this.email = other.email;
-    }
-  }
-
-  public NotificationEmail deepCopy() {
-    return new NotificationEmail(this);
-  }
-
-  @Override
-  public void clear() {
-    this.email = null;
-  }
-
-  public java.lang.String getEmail() {
-    return this.email;
-  }
-
-  public void setEmail(java.lang.String email) {
-    this.email = email;
-  }
-
-  public void unsetEmail() {
-    this.email = null;
-  }
-
-  /** Returns true if field email is set (has been assigned a value) and false otherwise */
-  public boolean isSetEmail() {
-    return this.email != null;
-  }
-
-  public void setEmailIsSet(boolean value) {
-    if (!value) {
-      this.email = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, java.lang.Object value) {
-    switch (field) {
-    case EMAIL:
-      if (value == null) {
-        unsetEmail();
-      } else {
-        setEmail((java.lang.String)value);
-      }
-      break;
-
-    }
-  }
-
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case EMAIL:
-      return getEmail();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case EMAIL:
-      return isSetEmail();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof NotificationEmail)
-      return this.equals((NotificationEmail)that);
-    return false;
-  }
-
-  public boolean equals(NotificationEmail that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_email = true && this.isSetEmail();
-    boolean that_present_email = true && that.isSetEmail();
-    if (this_present_email || that_present_email) {
-      if (!(this_present_email && that_present_email))
-        return false;
-      if (!this.email.equals(that.email))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetEmail()) ? 131071 : 524287);
-    if (isSetEmail())
-      hashCode = hashCode * 8191 + email.hashCode();
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(NotificationEmail other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.valueOf(isSetEmail()).compareTo(other.isSetEmail());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetEmail()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.email, other.email);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("NotificationEmail(");
-    boolean first = true;
-
-    sb.append("email:");
-    if (this.email == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.email);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetEmail()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'email' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class NotificationEmailStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public NotificationEmailStandardScheme getScheme() {
-      return new NotificationEmailStandardScheme();
-    }
-  }
-
-  private static class NotificationEmailStandardScheme extends org.apache.thrift.scheme.StandardScheme<NotificationEmail> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, NotificationEmail struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // EMAIL
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.email = iprot.readString();
-              struct.setEmailIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, NotificationEmail struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.email != null) {
-        oprot.writeFieldBegin(EMAIL_FIELD_DESC);
-        oprot.writeString(struct.email);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class NotificationEmailTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public NotificationEmailTupleScheme getScheme() {
-      return new NotificationEmailTupleScheme();
-    }
-  }
-
-  private static class NotificationEmailTupleScheme extends org.apache.thrift.scheme.TupleScheme<NotificationEmail> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, NotificationEmail struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      oprot.writeString(struct.email);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, NotificationEmail struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.email = iprot.readString();
-      struct.setEmailIsSet(true);
-    }
-  }
-
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-  }
-}
-
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/WorkflowApplication.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/WorkflowApplication.java
deleted file mode 100644
index 236d468..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/WorkflowApplication.java
+++ /dev/null
@@ -1,1701 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
-public class WorkflowApplication implements org.apache.thrift.TBase<WorkflowApplication, WorkflowApplication._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowApplication> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowApplication");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField BELONGS_TO_MAIN_WORKFLOW_FIELD_DESC = new org.apache.thrift.protocol.TField("belongsToMainWorkflow", org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField QUEUE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("queueName", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField NODE_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("nodeCount", org.apache.thrift.protocol.TType.I32, (short)6);
-  private static final org.apache.thrift.protocol.TField CORE_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("coreCount", org.apache.thrift.protocol.TType.I32, (short)7);
-  private static final org.apache.thrift.protocol.TField WALL_TIME_LIMIT_FIELD_DESC = new org.apache.thrift.protocol.TField("wallTimeLimit", org.apache.thrift.protocol.TType.I32, (short)8);
-  private static final org.apache.thrift.protocol.TField PHYSICAL_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("physicalMemory", org.apache.thrift.protocol.TType.I32, (short)9);
-  private static final org.apache.thrift.protocol.TField STATUSES_FIELD_DESC = new org.apache.thrift.protocol.TField("statuses", org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)11);
-  private static final org.apache.thrift.protocol.TField CREATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("createdAt", org.apache.thrift.protocol.TType.I64, (short)12);
-  private static final org.apache.thrift.protocol.TField UPDATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedAt", org.apache.thrift.protocol.TType.I64, (short)13);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkflowApplicationStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkflowApplicationTupleSchemeFactory();
-
-  private java.lang.String id; // required
-  private boolean belongsToMainWorkflow; // required
-  private java.lang.String applicationInterfaceId; // optional
-  private java.lang.String computeResourceId; // optional
-  private java.lang.String queueName; // optional
-  private int nodeCount; // optional
-  private int coreCount; // optional
-  private int wallTimeLimit; // optional
-  private int physicalMemory; // optional
-  private java.util.List<ApplicationStatus> statuses; // optional
-  private java.util.List<org.apache.airavata.model.commons.ErrorModel> errors; // optional
-  private long createdAt; // optional
-  private long updatedAt; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    ID((short)1, "id"),
-    BELONGS_TO_MAIN_WORKFLOW((short)2, "belongsToMainWorkflow"),
-    APPLICATION_INTERFACE_ID((short)3, "applicationInterfaceId"),
-    COMPUTE_RESOURCE_ID((short)4, "computeResourceId"),
-    QUEUE_NAME((short)5, "queueName"),
-    NODE_COUNT((short)6, "nodeCount"),
-    CORE_COUNT((short)7, "coreCount"),
-    WALL_TIME_LIMIT((short)8, "wallTimeLimit"),
-    PHYSICAL_MEMORY((short)9, "physicalMemory"),
-    STATUSES((short)10, "statuses"),
-    ERRORS((short)11, "errors"),
-    CREATED_AT((short)12, "createdAt"),
-    UPDATED_AT((short)13, "updatedAt");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ID
-          return ID;
-        case 2: // BELONGS_TO_MAIN_WORKFLOW
-          return BELONGS_TO_MAIN_WORKFLOW;
-        case 3: // APPLICATION_INTERFACE_ID
-          return APPLICATION_INTERFACE_ID;
-        case 4: // COMPUTE_RESOURCE_ID
-          return COMPUTE_RESOURCE_ID;
-        case 5: // QUEUE_NAME
-          return QUEUE_NAME;
-        case 6: // NODE_COUNT
-          return NODE_COUNT;
-        case 7: // CORE_COUNT
-          return CORE_COUNT;
-        case 8: // WALL_TIME_LIMIT
-          return WALL_TIME_LIMIT;
-        case 9: // PHYSICAL_MEMORY
-          return PHYSICAL_MEMORY;
-        case 10: // STATUSES
-          return STATUSES;
-        case 11: // ERRORS
-          return ERRORS;
-        case 12: // CREATED_AT
-          return CREATED_AT;
-        case 13: // UPDATED_AT
-          return UPDATED_AT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __BELONGSTOMAINWORKFLOW_ISSET_ID = 0;
-  private static final int __NODECOUNT_ISSET_ID = 1;
-  private static final int __CORECOUNT_ISSET_ID = 2;
-  private static final int __WALLTIMELIMIT_ISSET_ID = 3;
-  private static final int __PHYSICALMEMORY_ISSET_ID = 4;
-  private static final int __CREATEDAT_ISSET_ID = 5;
-  private static final int __UPDATEDAT_ISSET_ID = 6;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.APPLICATION_INTERFACE_ID,_Fields.COMPUTE_RESOURCE_ID,_Fields.QUEUE_NAME,_Fields.NODE_COUNT,_Fields.CORE_COUNT,_Fields.WALL_TIME_LIMIT,_Fields.PHYSICAL_MEMORY,_Fields.STATUSES,_Fields.ERRORS,_Fields.CREATED_AT,_Fields.UPDATED_AT};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BELONGS_TO_MAIN_WORKFLOW, new org.apache.thrift.meta_data.FieldMetaData("belongsToMainWorkflow", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COMPUTE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("computeResourceId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.QUEUE_NAME, new org.apache.thrift.meta_data.FieldMetaData("queueName", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.NODE_COUNT, new org.apache.thrift.meta_data.FieldMetaData("nodeCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.CORE_COUNT, new org.apache.thrift.meta_data.FieldMetaData("coreCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.WALL_TIME_LIMIT, new org.apache.thrift.meta_data.FieldMetaData("wallTimeLimit", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.PHYSICAL_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("physicalMemory", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.STATUSES, new org.apache.thrift.meta_data.FieldMetaData("statuses", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ApplicationStatus.class))));
-    tmpMap.put(_Fields.ERRORS, new org.apache.thrift.meta_data.FieldMetaData("errors", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.commons.ErrorModel.class))));
-    tmpMap.put(_Fields.CREATED_AT, new org.apache.thrift.meta_data.FieldMetaData("createdAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.UPDATED_AT, new org.apache.thrift.meta_data.FieldMetaData("updatedAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkflowApplication.class, metaDataMap);
-  }
-
-  public WorkflowApplication() {
-  }
-
-  public WorkflowApplication(
-    java.lang.String id,
-    boolean belongsToMainWorkflow)
-  {
-    this();
-    this.id = id;
-    this.belongsToMainWorkflow = belongsToMainWorkflow;
-    setBelongsToMainWorkflowIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public WorkflowApplication(WorkflowApplication other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetId()) {
-      this.id = other.id;
-    }
-    this.belongsToMainWorkflow = other.belongsToMainWorkflow;
-    if (other.isSetApplicationInterfaceId()) {
-      this.applicationInterfaceId = other.applicationInterfaceId;
-    }
-    if (other.isSetComputeResourceId()) {
-      this.computeResourceId = other.computeResourceId;
-    }
-    if (other.isSetQueueName()) {
-      this.queueName = other.queueName;
-    }
-    this.nodeCount = other.nodeCount;
-    this.coreCount = other.coreCount;
-    this.wallTimeLimit = other.wallTimeLimit;
-    this.physicalMemory = other.physicalMemory;
-    if (other.isSetStatuses()) {
-      java.util.List<ApplicationStatus> __this__statuses = new java.util.ArrayList<ApplicationStatus>(other.statuses.size());
-      for (ApplicationStatus other_element : other.statuses) {
-        __this__statuses.add(new ApplicationStatus(other_element));
-      }
-      this.statuses = __this__statuses;
-    }
-    if (other.isSetErrors()) {
-      java.util.List<org.apache.airavata.model.commons.ErrorModel> __this__errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(other.errors.size());
-      for (org.apache.airavata.model.commons.ErrorModel other_element : other.errors) {
-        __this__errors.add(new org.apache.airavata.model.commons.ErrorModel(other_element));
-      }
-      this.errors = __this__errors;
-    }
-    this.createdAt = other.createdAt;
-    this.updatedAt = other.updatedAt;
-  }
-
-  public WorkflowApplication deepCopy() {
-    return new WorkflowApplication(this);
-  }
-
-  @Override
-  public void clear() {
-    this.id = null;
-    setBelongsToMainWorkflowIsSet(false);
-    this.belongsToMainWorkflow = false;
-    this.applicationInterfaceId = null;
-    this.computeResourceId = null;
-    this.queueName = null;
-    setNodeCountIsSet(false);
-    this.nodeCount = 0;
-    setCoreCountIsSet(false);
-    this.coreCount = 0;
-    setWallTimeLimitIsSet(false);
-    this.wallTimeLimit = 0;
-    setPhysicalMemoryIsSet(false);
-    this.physicalMemory = 0;
-    this.statuses = null;
-    this.errors = null;
-    setCreatedAtIsSet(false);
-    this.createdAt = 0;
-    setUpdatedAtIsSet(false);
-    this.updatedAt = 0;
-  }
-
-  public java.lang.String getId() {
-    return this.id;
-  }
-
-  public void setId(java.lang.String id) {
-    this.id = id;
-  }
-
-  public void unsetId() {
-    this.id = null;
-  }
-
-  /** Returns true if field id is set (has been assigned a value) and false otherwise */
-  public boolean isSetId() {
-    return this.id != null;
-  }
-
-  public void setIdIsSet(boolean value) {
-    if (!value) {
-      this.id = null;
-    }
-  }
-
-  public boolean isBelongsToMainWorkflow() {
-    return this.belongsToMainWorkflow;
-  }
-
-  public void setBelongsToMainWorkflow(boolean belongsToMainWorkflow) {
-    this.belongsToMainWorkflow = belongsToMainWorkflow;
-    setBelongsToMainWorkflowIsSet(true);
-  }
-
-  public void unsetBelongsToMainWorkflow() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __BELONGSTOMAINWORKFLOW_ISSET_ID);
-  }
-
-  /** Returns true if field belongsToMainWorkflow is set (has been assigned a value) and false otherwise */
-  public boolean isSetBelongsToMainWorkflow() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __BELONGSTOMAINWORKFLOW_ISSET_ID);
-  }
-
-  public void setBelongsToMainWorkflowIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BELONGSTOMAINWORKFLOW_ISSET_ID, value);
-  }
-
-  public java.lang.String getApplicationInterfaceId() {
-    return this.applicationInterfaceId;
-  }
-
-  public void setApplicationInterfaceId(java.lang.String applicationInterfaceId) {
-    this.applicationInterfaceId = applicationInterfaceId;
-  }
-
-  public void unsetApplicationInterfaceId() {
-    this.applicationInterfaceId = null;
-  }
-
-  /** Returns true if field applicationInterfaceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetApplicationInterfaceId() {
-    return this.applicationInterfaceId != null;
-  }
-
-  public void setApplicationInterfaceIdIsSet(boolean value) {
-    if (!value) {
-      this.applicationInterfaceId = null;
-    }
-  }
-
-  public java.lang.String getComputeResourceId() {
-    return this.computeResourceId;
-  }
-
-  public void setComputeResourceId(java.lang.String computeResourceId) {
-    this.computeResourceId = computeResourceId;
-  }
-
-  public void unsetComputeResourceId() {
-    this.computeResourceId = null;
-  }
-
-  /** Returns true if field computeResourceId is set (has been assigned a value) and false otherwise */
-  public boolean isSetComputeResourceId() {
-    return this.computeResourceId != null;
-  }
-
-  public void setComputeResourceIdIsSet(boolean value) {
-    if (!value) {
-      this.computeResourceId = null;
-    }
-  }
-
-  public java.lang.String getQueueName() {
-    return this.queueName;
-  }
-
-  public void setQueueName(java.lang.String queueName) {
-    this.queueName = queueName;
-  }
-
-  public void unsetQueueName() {
-    this.queueName = null;
-  }
-
-  /** Returns true if field queueName is set (has been assigned a value) and false otherwise */
-  public boolean isSetQueueName() {
-    return this.queueName != null;
-  }
-
-  public void setQueueNameIsSet(boolean value) {
-    if (!value) {
-      this.queueName = null;
-    }
-  }
-
-  public int getNodeCount() {
-    return this.nodeCount;
-  }
-
-  public void setNodeCount(int nodeCount) {
-    this.nodeCount = nodeCount;
-    setNodeCountIsSet(true);
-  }
-
-  public void unsetNodeCount() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __NODECOUNT_ISSET_ID);
-  }
-
-  /** Returns true if field nodeCount is set (has been assigned a value) and false otherwise */
-  public boolean isSetNodeCount() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __NODECOUNT_ISSET_ID);
-  }
-
-  public void setNodeCountIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __NODECOUNT_ISSET_ID, value);
-  }
-
-  public int getCoreCount() {
-    return this.coreCount;
-  }
-
-  public void setCoreCount(int coreCount) {
-    this.coreCount = coreCount;
-    setCoreCountIsSet(true);
-  }
-
-  public void unsetCoreCount() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CORECOUNT_ISSET_ID);
-  }
-
-  /** Returns true if field coreCount is set (has been assigned a value) and false otherwise */
-  public boolean isSetCoreCount() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CORECOUNT_ISSET_ID);
-  }
-
-  public void setCoreCountIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CORECOUNT_ISSET_ID, value);
-  }
-
-  public int getWallTimeLimit() {
-    return this.wallTimeLimit;
-  }
-
-  public void setWallTimeLimit(int wallTimeLimit) {
-    this.wallTimeLimit = wallTimeLimit;
-    setWallTimeLimitIsSet(true);
-  }
-
-  public void unsetWallTimeLimit() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __WALLTIMELIMIT_ISSET_ID);
-  }
-
-  /** Returns true if field wallTimeLimit is set (has been assigned a value) and false otherwise */
-  public boolean isSetWallTimeLimit() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __WALLTIMELIMIT_ISSET_ID);
-  }
-
-  public void setWallTimeLimitIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __WALLTIMELIMIT_ISSET_ID, value);
-  }
-
-  public int getPhysicalMemory() {
-    return this.physicalMemory;
-  }
-
-  public void setPhysicalMemory(int physicalMemory) {
-    this.physicalMemory = physicalMemory;
-    setPhysicalMemoryIsSet(true);
-  }
-
-  public void unsetPhysicalMemory() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PHYSICALMEMORY_ISSET_ID);
-  }
-
-  /** Returns true if field physicalMemory is set (has been assigned a value) and false otherwise */
-  public boolean isSetPhysicalMemory() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PHYSICALMEMORY_ISSET_ID);
-  }
-
-  public void setPhysicalMemoryIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PHYSICALMEMORY_ISSET_ID, value);
-  }
-
-  public int getStatusesSize() {
-    return (this.statuses == null) ? 0 : this.statuses.size();
-  }
-
-  public java.util.Iterator<ApplicationStatus> getStatusesIterator() {
-    return (this.statuses == null) ? null : this.statuses.iterator();
-  }
-
-  public void addToStatuses(ApplicationStatus elem) {
-    if (this.statuses == null) {
-      this.statuses = new java.util.ArrayList<ApplicationStatus>();
-    }
-    this.statuses.add(elem);
-  }
-
-  public java.util.List<ApplicationStatus> getStatuses() {
-    return this.statuses;
-  }
-
-  public void setStatuses(java.util.List<ApplicationStatus> statuses) {
-    this.statuses = statuses;
-  }
-
-  public void unsetStatuses() {
-    this.statuses = null;
-  }
-
-  /** Returns true if field statuses is set (has been assigned a value) and false otherwise */
-  public boolean isSetStatuses() {
-    return this.statuses != null;
-  }
-
-  public void setStatusesIsSet(boolean value) {
-    if (!value) {
-      this.statuses = null;
-    }
-  }
-
-  public int getErrorsSize() {
-    return (this.errors == null) ? 0 : this.errors.size();
-  }
-
-  public java.util.Iterator<org.apache.airavata.model.commons.ErrorModel> getErrorsIterator() {
-    return (this.errors == null) ? null : this.errors.iterator();
-  }
-
-  public void addToErrors(org.apache.airavata.model.commons.ErrorModel elem) {
-    if (this.errors == null) {
-      this.errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>();
-    }
-    this.errors.add(elem);
-  }
-
-  public java.util.List<org.apache.airavata.model.commons.ErrorModel> getErrors() {
-    return this.errors;
-  }
-
-  public void setErrors(java.util.List<org.apache.airavata.model.commons.ErrorModel> errors) {
-    this.errors = errors;
-  }
-
-  public void unsetErrors() {
-    this.errors = null;
-  }
-
-  /** Returns true if field errors is set (has been assigned a value) and false otherwise */
-  public boolean isSetErrors() {
-    return this.errors != null;
-  }
-
-  public void setErrorsIsSet(boolean value) {
-    if (!value) {
-      this.errors = null;
-    }
-  }
-
-  public long getCreatedAt() {
-    return this.createdAt;
-  }
-
-  public void setCreatedAt(long createdAt) {
-    this.createdAt = createdAt;
-    setCreatedAtIsSet(true);
-  }
-
-  public void unsetCreatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field createdAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetCreatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATEDAT_ISSET_ID);
-  }
-
-  public void setCreatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATEDAT_ISSET_ID, value);
-  }
-
-  public long getUpdatedAt() {
-    return this.updatedAt;
-  }
-
-  public void setUpdatedAt(long updatedAt) {
-    this.updatedAt = updatedAt;
-    setUpdatedAtIsSet(true);
-  }
-
-  public void unsetUpdatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field updatedAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetUpdatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  public void setUpdatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATEDAT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, java.lang.Object value) {
-    switch (field) {
-    case ID:
-      if (value == null) {
-        unsetId();
-      } else {
-        setId((java.lang.String)value);
-      }
-      break;
-
-    case BELONGS_TO_MAIN_WORKFLOW:
-      if (value == null) {
-        unsetBelongsToMainWorkflow();
-      } else {
-        setBelongsToMainWorkflow((java.lang.Boolean)value);
-      }
-      break;
-
-    case APPLICATION_INTERFACE_ID:
-      if (value == null) {
-        unsetApplicationInterfaceId();
-      } else {
-        setApplicationInterfaceId((java.lang.String)value);
-      }
-      break;
-
-    case COMPUTE_RESOURCE_ID:
-      if (value == null) {
-        unsetComputeResourceId();
-      } else {
-        setComputeResourceId((java.lang.String)value);
-      }
-      break;
-
-    case QUEUE_NAME:
-      if (value == null) {
-        unsetQueueName();
-      } else {
-        setQueueName((java.lang.String)value);
-      }
-      break;
-
-    case NODE_COUNT:
-      if (value == null) {
-        unsetNodeCount();
-      } else {
-        setNodeCount((java.lang.Integer)value);
-      }
-      break;
-
-    case CORE_COUNT:
-      if (value == null) {
-        unsetCoreCount();
-      } else {
-        setCoreCount((java.lang.Integer)value);
-      }
-      break;
-
-    case WALL_TIME_LIMIT:
-      if (value == null) {
-        unsetWallTimeLimit();
-      } else {
-        setWallTimeLimit((java.lang.Integer)value);
-      }
-      break;
-
-    case PHYSICAL_MEMORY:
-      if (value == null) {
-        unsetPhysicalMemory();
-      } else {
-        setPhysicalMemory((java.lang.Integer)value);
-      }
-      break;
-
-    case STATUSES:
-      if (value == null) {
-        unsetStatuses();
-      } else {
-        setStatuses((java.util.List<ApplicationStatus>)value);
-      }
-      break;
-
-    case ERRORS:
-      if (value == null) {
-        unsetErrors();
-      } else {
-        setErrors((java.util.List<org.apache.airavata.model.commons.ErrorModel>)value);
-      }
-      break;
-
-    case CREATED_AT:
-      if (value == null) {
-        unsetCreatedAt();
-      } else {
-        setCreatedAt((java.lang.Long)value);
-      }
-      break;
-
-    case UPDATED_AT:
-      if (value == null) {
-        unsetUpdatedAt();
-      } else {
-        setUpdatedAt((java.lang.Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ID:
-      return getId();
-
-    case BELONGS_TO_MAIN_WORKFLOW:
-      return isBelongsToMainWorkflow();
-
-    case APPLICATION_INTERFACE_ID:
-      return getApplicationInterfaceId();
-
-    case COMPUTE_RESOURCE_ID:
-      return getComputeResourceId();
-
-    case QUEUE_NAME:
-      return getQueueName();
-
-    case NODE_COUNT:
-      return getNodeCount();
-
-    case CORE_COUNT:
-      return getCoreCount();
-
-    case WALL_TIME_LIMIT:
-      return getWallTimeLimit();
-
-    case PHYSICAL_MEMORY:
-      return getPhysicalMemory();
-
-    case STATUSES:
-      return getStatuses();
-
-    case ERRORS:
-      return getErrors();
-
-    case CREATED_AT:
-      return getCreatedAt();
-
-    case UPDATED_AT:
-      return getUpdatedAt();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case ID:
-      return isSetId();
-    case BELONGS_TO_MAIN_WORKFLOW:
-      return isSetBelongsToMainWorkflow();
-    case APPLICATION_INTERFACE_ID:
-      return isSetApplicationInterfaceId();
-    case COMPUTE_RESOURCE_ID:
-      return isSetComputeResourceId();
-    case QUEUE_NAME:
-      return isSetQueueName();
-    case NODE_COUNT:
-      return isSetNodeCount();
-    case CORE_COUNT:
-      return isSetCoreCount();
-    case WALL_TIME_LIMIT:
-      return isSetWallTimeLimit();
-    case PHYSICAL_MEMORY:
-      return isSetPhysicalMemory();
-    case STATUSES:
-      return isSetStatuses();
-    case ERRORS:
-      return isSetErrors();
-    case CREATED_AT:
-      return isSetCreatedAt();
-    case UPDATED_AT:
-      return isSetUpdatedAt();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof WorkflowApplication)
-      return this.equals((WorkflowApplication)that);
-    return false;
-  }
-
-  public boolean equals(WorkflowApplication that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_id = true && this.isSetId();
-    boolean that_present_id = true && that.isSetId();
-    if (this_present_id || that_present_id) {
-      if (!(this_present_id && that_present_id))
-        return false;
-      if (!this.id.equals(that.id))
-        return false;
-    }
-
-    boolean this_present_belongsToMainWorkflow = true;
-    boolean that_present_belongsToMainWorkflow = true;
-    if (this_present_belongsToMainWorkflow || that_present_belongsToMainWorkflow) {
-      if (!(this_present_belongsToMainWorkflow && that_present_belongsToMainWorkflow))
-        return false;
-      if (this.belongsToMainWorkflow != that.belongsToMainWorkflow)
-        return false;
-    }
-
-    boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId();
-    boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId();
-    if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) {
-      if (!(this_present_applicationInterfaceId && that_present_applicationInterfaceId))
-        return false;
-      if (!this.applicationInterfaceId.equals(that.applicationInterfaceId))
-        return false;
-    }
-
-    boolean this_present_computeResourceId = true && this.isSetComputeResourceId();
-    boolean that_present_computeResourceId = true && that.isSetComputeResourceId();
-    if (this_present_computeResourceId || that_present_computeResourceId) {
-      if (!(this_present_computeResourceId && that_present_computeResourceId))
-        return false;
-      if (!this.computeResourceId.equals(that.computeResourceId))
-        return false;
-    }
-
-    boolean this_present_queueName = true && this.isSetQueueName();
-    boolean that_present_queueName = true && that.isSetQueueName();
-    if (this_present_queueName || that_present_queueName) {
-      if (!(this_present_queueName && that_present_queueName))
-        return false;
-      if (!this.queueName.equals(that.queueName))
-        return false;
-    }
-
-    boolean this_present_nodeCount = true && this.isSetNodeCount();
-    boolean that_present_nodeCount = true && that.isSetNodeCount();
-    if (this_present_nodeCount || that_present_nodeCount) {
-      if (!(this_present_nodeCount && that_present_nodeCount))
-        return false;
-      if (this.nodeCount != that.nodeCount)
-        return false;
-    }
-
-    boolean this_present_coreCount = true && this.isSetCoreCount();
-    boolean that_present_coreCount = true && that.isSetCoreCount();
-    if (this_present_coreCount || that_present_coreCount) {
-      if (!(this_present_coreCount && that_present_coreCount))
-        return false;
-      if (this.coreCount != that.coreCount)
-        return false;
-    }
-
-    boolean this_present_wallTimeLimit = true && this.isSetWallTimeLimit();
-    boolean that_present_wallTimeLimit = true && that.isSetWallTimeLimit();
-    if (this_present_wallTimeLimit || that_present_wallTimeLimit) {
-      if (!(this_present_wallTimeLimit && that_present_wallTimeLimit))
-        return false;
-      if (this.wallTimeLimit != that.wallTimeLimit)
-        return false;
-    }
-
-    boolean this_present_physicalMemory = true && this.isSetPhysicalMemory();
-    boolean that_present_physicalMemory = true && that.isSetPhysicalMemory();
-    if (this_present_physicalMemory || that_present_physicalMemory) {
-      if (!(this_present_physicalMemory && that_present_physicalMemory))
-        return false;
-      if (this.physicalMemory != that.physicalMemory)
-        return false;
-    }
-
-    boolean this_present_statuses = true && this.isSetStatuses();
-    boolean that_present_statuses = true && that.isSetStatuses();
-    if (this_present_statuses || that_present_statuses) {
-      if (!(this_present_statuses && that_present_statuses))
-        return false;
-      if (!this.statuses.equals(that.statuses))
-        return false;
-    }
-
-    boolean this_present_errors = true && this.isSetErrors();
-    boolean that_present_errors = true && that.isSetErrors();
-    if (this_present_errors || that_present_errors) {
-      if (!(this_present_errors && that_present_errors))
-        return false;
-      if (!this.errors.equals(that.errors))
-        return false;
-    }
-
-    boolean this_present_createdAt = true && this.isSetCreatedAt();
-    boolean that_present_createdAt = true && that.isSetCreatedAt();
-    if (this_present_createdAt || that_present_createdAt) {
-      if (!(this_present_createdAt && that_present_createdAt))
-        return false;
-      if (this.createdAt != that.createdAt)
-        return false;
-    }
-
-    boolean this_present_updatedAt = true && this.isSetUpdatedAt();
-    boolean that_present_updatedAt = true && that.isSetUpdatedAt();
-    if (this_present_updatedAt || that_present_updatedAt) {
-      if (!(this_present_updatedAt && that_present_updatedAt))
-        return false;
-      if (this.updatedAt != that.updatedAt)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetId()) ? 131071 : 524287);
-    if (isSetId())
-      hashCode = hashCode * 8191 + id.hashCode();
-
-    hashCode = hashCode * 8191 + ((belongsToMainWorkflow) ? 131071 : 524287);
-
-    hashCode = hashCode * 8191 + ((isSetApplicationInterfaceId()) ? 131071 : 524287);
-    if (isSetApplicationInterfaceId())
-      hashCode = hashCode * 8191 + applicationInterfaceId.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetComputeResourceId()) ? 131071 : 524287);
-    if (isSetComputeResourceId())
-      hashCode = hashCode * 8191 + computeResourceId.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetQueueName()) ? 131071 : 524287);
-    if (isSetQueueName())
-      hashCode = hashCode * 8191 + queueName.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetNodeCount()) ? 131071 : 524287);
-    if (isSetNodeCount())
-      hashCode = hashCode * 8191 + nodeCount;
-
-    hashCode = hashCode * 8191 + ((isSetCoreCount()) ? 131071 : 524287);
-    if (isSetCoreCount())
-      hashCode = hashCode * 8191 + coreCount;
-
-    hashCode = hashCode * 8191 + ((isSetWallTimeLimit()) ? 131071 : 524287);
-    if (isSetWallTimeLimit())
-      hashCode = hashCode * 8191 + wallTimeLimit;
-
-    hashCode = hashCode * 8191 + ((isSetPhysicalMemory()) ? 131071 : 524287);
-    if (isSetPhysicalMemory())
-      hashCode = hashCode * 8191 + physicalMemory;
-
-    hashCode = hashCode * 8191 + ((isSetStatuses()) ? 131071 : 524287);
-    if (isSetStatuses())
-      hashCode = hashCode * 8191 + statuses.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetErrors()) ? 131071 : 524287);
-    if (isSetErrors())
-      hashCode = hashCode * 8191 + errors.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetCreatedAt()) ? 131071 : 524287);
-    if (isSetCreatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createdAt);
-
-    hashCode = hashCode * 8191 + ((isSetUpdatedAt()) ? 131071 : 524287);
-    if (isSetUpdatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updatedAt);
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(WorkflowApplication other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetBelongsToMainWorkflow()).compareTo(other.isSetBelongsToMainWorkflow());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetBelongsToMainWorkflow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.belongsToMainWorkflow, other.belongsToMainWorkflow);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetApplicationInterfaceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationInterfaceId, other.applicationInterfaceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetComputeResourceId()).compareTo(other.isSetComputeResourceId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetComputeResourceId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computeResourceId, other.computeResourceId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetQueueName()).compareTo(other.isSetQueueName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQueueName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queueName, other.queueName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetNodeCount()).compareTo(other.isSetNodeCount());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetNodeCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nodeCount, other.nodeCount);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetCoreCount()).compareTo(other.isSetCoreCount());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCoreCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.coreCount, other.coreCount);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetWallTimeLimit()).compareTo(other.isSetWallTimeLimit());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetWallTimeLimit()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.wallTimeLimit, other.wallTimeLimit);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetPhysicalMemory()).compareTo(other.isSetPhysicalMemory());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPhysicalMemory()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.physicalMemory, other.physicalMemory);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetStatuses()).compareTo(other.isSetStatuses());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetStatuses()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statuses, other.statuses);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetErrors()).compareTo(other.isSetErrors());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetErrors()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errors, other.errors);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetCreatedAt()).compareTo(other.isSetCreatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCreatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createdAt, other.createdAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetUpdatedAt()).compareTo(other.isSetUpdatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUpdatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updatedAt, other.updatedAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("WorkflowApplication(");
-    boolean first = true;
-
-    sb.append("id:");
-    if (this.id == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.id);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("belongsToMainWorkflow:");
-    sb.append(this.belongsToMainWorkflow);
-    first = false;
-    if (isSetApplicationInterfaceId()) {
-      if (!first) sb.append(", ");
-      sb.append("applicationInterfaceId:");
-      if (this.applicationInterfaceId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.applicationInterfaceId);
-      }
-      first = false;
-    }
-    if (isSetComputeResourceId()) {
-      if (!first) sb.append(", ");
-      sb.append("computeResourceId:");
-      if (this.computeResourceId == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.computeResourceId);
-      }
-      first = false;
-    }
-    if (isSetQueueName()) {
-      if (!first) sb.append(", ");
-      sb.append("queueName:");
-      if (this.queueName == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.queueName);
-      }
-      first = false;
-    }
-    if (isSetNodeCount()) {
-      if (!first) sb.append(", ");
-      sb.append("nodeCount:");
-      sb.append(this.nodeCount);
-      first = false;
-    }
-    if (isSetCoreCount()) {
-      if (!first) sb.append(", ");
-      sb.append("coreCount:");
-      sb.append(this.coreCount);
-      first = false;
-    }
-    if (isSetWallTimeLimit()) {
-      if (!first) sb.append(", ");
-      sb.append("wallTimeLimit:");
-      sb.append(this.wallTimeLimit);
-      first = false;
-    }
-    if (isSetPhysicalMemory()) {
-      if (!first) sb.append(", ");
-      sb.append("physicalMemory:");
-      sb.append(this.physicalMemory);
-      first = false;
-    }
-    if (isSetStatuses()) {
-      if (!first) sb.append(", ");
-      sb.append("statuses:");
-      if (this.statuses == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.statuses);
-      }
-      first = false;
-    }
-    if (isSetErrors()) {
-      if (!first) sb.append(", ");
-      sb.append("errors:");
-      if (this.errors == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.errors);
-      }
-      first = false;
-    }
-    if (isSetCreatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("createdAt:");
-      sb.append(this.createdAt);
-      first = false;
-    }
-    if (isSetUpdatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("updatedAt:");
-      sb.append(this.updatedAt);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
-    }
-
-    if (!isSetBelongsToMainWorkflow()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'belongsToMainWorkflow' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class WorkflowApplicationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public WorkflowApplicationStandardScheme getScheme() {
-      return new WorkflowApplicationStandardScheme();
-    }
-  }
-
-  private static class WorkflowApplicationStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkflowApplication> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkflowApplication struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // BELONGS_TO_MAIN_WORKFLOW
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.belongsToMainWorkflow = iprot.readBool();
-              struct.setBelongsToMainWorkflowIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // APPLICATION_INTERFACE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.applicationInterfaceId = iprot.readString();
-              struct.setApplicationInterfaceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // COMPUTE_RESOURCE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.computeResourceId = iprot.readString();
-              struct.setComputeResourceIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // QUEUE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.queueName = iprot.readString();
-              struct.setQueueNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // NODE_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.nodeCount = iprot.readI32();
-              struct.setNodeCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // CORE_COUNT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.coreCount = iprot.readI32();
-              struct.setCoreCountIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 8: // WALL_TIME_LIMIT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.wallTimeLimit = iprot.readI32();
-              struct.setWallTimeLimitIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 9: // PHYSICAL_MEMORY
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.physicalMemory = iprot.readI32();
-              struct.setPhysicalMemoryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 10: // STATUSES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.statuses = new java.util.ArrayList<ApplicationStatus>(_list0.size);
-                ApplicationStatus _elem1;
-                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
-                {
-                  _elem1 = new ApplicationStatus();
-                  _elem1.read(iprot);
-                  struct.statuses.add(_elem1);
-                }
-                iprot.readListEnd();
-              }
-              struct.setStatusesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 11: // ERRORS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
-                struct.errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list3.size);
-                org.apache.airavata.model.commons.ErrorModel _elem4;
-                for (int _i5 = 0; _i5 < _list3.size; ++_i5)
-                {
-                  _elem4 = new org.apache.airavata.model.commons.ErrorModel();
-                  _elem4.read(iprot);
-                  struct.errors.add(_elem4);
-                }
-                iprot.readListEnd();
-              }
-              struct.setErrorsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 12: // CREATED_AT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.createdAt = iprot.readI64();
-              struct.setCreatedAtIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 13: // UPDATED_AT
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.updatedAt = iprot.readI64();
-              struct.setUpdatedAtIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, WorkflowApplication struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.id != null) {
-        oprot.writeFieldBegin(ID_FIELD_DESC);
-        oprot.writeString(struct.id);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(BELONGS_TO_MAIN_WORKFLOW_FIELD_DESC);
-      oprot.writeBool(struct.belongsToMainWorkflow);
-      oprot.writeFieldEnd();
-      if (struct.applicationInterfaceId != null) {
-        if (struct.isSetApplicationInterfaceId()) {
-          oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC);
-          oprot.writeString(struct.applicationInterfaceId);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.computeResourceId != null) {
-        if (struct.isSetComputeResourceId()) {
-          oprot.writeFieldBegin(COMPUTE_RESOURCE_ID_FIELD_DESC);
-          oprot.writeString(struct.computeResourceId);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.queueName != null) {
-        if (struct.isSetQueueName()) {
-          oprot.writeFieldBegin(QUEUE_NAME_FIELD_DESC);
-          oprot.writeString(struct.queueName);
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetNodeCount()) {
-        oprot.writeFieldBegin(NODE_COUNT_FIELD_DESC);
-        oprot.writeI32(struct.nodeCount);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetCoreCount()) {
-        oprot.writeFieldBegin(CORE_COUNT_FIELD_DESC);
-        oprot.writeI32(struct.coreCount);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetWallTimeLimit()) {
-        oprot.writeFieldBegin(WALL_TIME_LIMIT_FIELD_DESC);
-        oprot.writeI32(struct.wallTimeLimit);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetPhysicalMemory()) {
-        oprot.writeFieldBegin(PHYSICAL_MEMORY_FIELD_DESC);
-        oprot.writeI32(struct.physicalMemory);
-        oprot.writeFieldEnd();
-      }
-      if (struct.statuses != null) {
-        if (struct.isSetStatuses()) {
-          oprot.writeFieldBegin(STATUSES_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.statuses.size()));
-            for (ApplicationStatus _iter6 : struct.statuses)
-            {
-              _iter6.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.errors != null) {
-        if (struct.isSetErrors()) {
-          oprot.writeFieldBegin(ERRORS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.errors.size()));
-            for (org.apache.airavata.model.commons.ErrorModel _iter7 : struct.errors)
-            {
-              _iter7.write(oprot);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      if (struct.isSetCreatedAt()) {
-        oprot.writeFieldBegin(CREATED_AT_FIELD_DESC);
-        oprot.writeI64(struct.createdAt);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeFieldBegin(UPDATED_AT_FIELD_DESC);
-        oprot.writeI64(struct.updatedAt);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class WorkflowApplicationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public WorkflowApplicationTupleScheme getScheme() {
-      return new WorkflowApplicationTupleScheme();
-    }
-  }
-
-  private static class WorkflowApplicationTupleScheme extends org.apache.thrift.scheme.TupleScheme<WorkflowApplication> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, WorkflowApplication struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      oprot.writeString(struct.id);
-      oprot.writeBool(struct.belongsToMainWorkflow);
-      java.util.BitSet optionals = new java.util.BitSet();
-      if (struct.isSetApplicationInterfaceId()) {
-        optionals.set(0);
-      }
-      if (struct.isSetComputeResourceId()) {
-        optionals.set(1);
-      }
-      if (struct.isSetQueueName()) {
-        optionals.set(2);
-      }
-      if (struct.isSetNodeCount()) {
-        optionals.set(3);
-      }
-      if (struct.isSetCoreCount()) {
-        optionals.set(4);
-      }
-      if (struct.isSetWallTimeLimit()) {
-        optionals.set(5);
-      }
-      if (struct.isSetPhysicalMemory()) {
-        optionals.set(6);
-      }
-      if (struct.isSetStatuses()) {
-        optionals.set(7);
-      }
-      if (struct.isSetErrors()) {
-        optionals.set(8);
-      }
-      if (struct.isSetCreatedAt()) {
-        optionals.set(9);
-      }
-      if (struct.isSetUpdatedAt()) {
-        optionals.set(10);
-      }
-      oprot.writeBitSet(optionals, 11);
-      if (struct.isSetApplicationInterfaceId()) {
-        oprot.writeString(struct.applicationInterfaceId);
-      }
-      if (struct.isSetComputeResourceId()) {
-        oprot.writeString(struct.computeResourceId);
-      }
-      if (struct.isSetQueueName()) {
-        oprot.writeString(struct.queueName);
-      }
-      if (struct.isSetNodeCount()) {
-        oprot.writeI32(struct.nodeCount);
-      }
-      if (struct.isSetCoreCount()) {
-        oprot.writeI32(struct.coreCount);
-      }
-      if (struct.isSetWallTimeLimit()) {
-        oprot.writeI32(struct.wallTimeLimit);
-      }
-      if (struct.isSetPhysicalMemory()) {
-        oprot.writeI32(struct.physicalMemory);
-      }
-      if (struct.isSetStatuses()) {
-        {
-          oprot.writeI32(struct.statuses.size());
-          for (ApplicationStatus _iter8 : struct.statuses)
-          {
-            _iter8.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetErrors()) {
-        {
-          oprot.writeI32(struct.errors.size());
-          for (org.apache.airavata.model.commons.ErrorModel _iter9 : struct.errors)
-          {
-            _iter9.write(oprot);
-          }
-        }
-      }
-      if (struct.isSetCreatedAt()) {
-        oprot.writeI64(struct.createdAt);
-      }
-      if (struct.isSetUpdatedAt()) {
-        oprot.writeI64(struct.updatedAt);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, WorkflowApplication struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
-      struct.id = iprot.readString();
-      struct.setIdIsSet(true);
-      struct.belongsToMainWorkflow = iprot.readBool();
-      struct.setBelongsToMainWorkflowIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(11);
-      if (incoming.get(0)) {
-        struct.applicationInterfaceId = iprot.readString();
-        struct.setApplicationInterfaceIdIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.computeResourceId = iprot.readString();
-        struct.setComputeResourceIdIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.queueName = iprot.readString();
-        struct.setQueueNameIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.nodeCount = iprot.readI32();
-        struct.setNodeCountIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.coreCount = iprot.readI32();
-        struct.setCoreCountIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.wallTimeLimit = iprot.readI32();
-        struct.setWallTimeLimitIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.physicalMemory = iprot.readI32();
-        struct.setPhysicalMemoryIsSet(true);
-      }
-      if (incoming.get(7)) {
-        {
-          org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.statuses = new java.util.ArrayList<ApplicationStatus>(_list10.size);
-          ApplicationStatus _elem11;
-          for (int _i12 = 0; _i12 < _list10.size; ++_i12)
-          {
-            _elem11 = new ApplicationStatus();
-            _elem11.read(iprot);
-            struct.statuses.add(_elem11);
-          }
-        }
-        struct.setStatusesIsSet(true);
-      }
-      if (incoming.get(8)) {
-        {
-          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.errors = new java.util.ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list13.size);
-          org.apache.airavata.model.commons.ErrorModel _elem14;
-          for (int _i15 = 0; _i15 < _list13.size; ++_i15)
-          {
-            _elem14 = new org.apache.airavata.model.commons.ErrorModel();
-            _elem14.read(iprot);
-            struct.errors.add(_elem14);
-          }
-        }
-        struct.setErrorsIsSet(true);
-      }
-      if (incoming.get(9)) {
-        struct.createdAt = iprot.readI64();
-        struct.setCreatedAtIsSet(true);
-      }
-      if (incoming.get(10)) {
-        struct.updatedAt = iprot.readI64();
-        struct.setUpdatedAtIsSet(true);
-      }
-    }
-  }
-
-  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
-    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
-  }
-}
-
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/WorkflowConnection.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/WorkflowConnection.java
deleted file mode 100644
index 82d9404..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/WorkflowConnection.java
+++ /dev/null
@@ -1,1303 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.10.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.model.workflow;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
-public class WorkflowConnection implements org.apache.thrift.TBase<WorkflowConnection, WorkflowConnection._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowConnection> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowConnection");
-
-  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField BELONGS_TO_MAIN_WORKFLOW_FIELD_DESC = new org.apache.thrift.protocol.TField("belongsToMainWorkflow", org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField FROM_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("fromType", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField FROM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("fromId", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField FROM_OUTPUT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("fromOutputName", org.apache.thrift.protocol.TType.STRING, (short)5);
-  private static final org.apache.thrift.protocol.TField TO_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("toType", org.apache.thrift.protocol.TType.I32, (short)6);
-  private static final org.apache.thrift.protocol.TField TO_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("toId", org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField TO_INPUT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("toInputName", org.apache.thrift.protocol.TType.STRING, (short)8);
-  private static final org.apache.thrift.protocol.TField CREATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("createdAt", org.apache.thrift.protocol.TType.I64, (short)9);
-  private static final org.apache.thrift.protocol.TField UPDATED_AT_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedAt", org.apache.thrift.protocol.TType.I64, (short)10);
-
-  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WorkflowConnectionStandardSchemeFactory();
-  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WorkflowConnectionTupleSchemeFactory();
-
-  private java.lang.String id; // required
-  private boolean belongsToMainWorkflow; // required
-  private org.apache.airavata.model.workflow.core.ComponentType fromType; // required
-  private java.lang.String fromId; // required
-  private java.lang.String fromOutputName; // required
-  private org.apache.airavata.model.workflow.core.ComponentType toType; // required
-  private java.lang.String toId; // required
-  private java.lang.String toInputName; // required
-  private long createdAt; // optional
-  private long updatedAt; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    ID((short)1, "id"),
-    BELONGS_TO_MAIN_WORKFLOW((short)2, "belongsToMainWorkflow"),
-    /**
-     * 
-     * @see org.apache.airavata.model.workflow.core.ComponentType
-     */
-    FROM_TYPE((short)3, "fromType"),
-    FROM_ID((short)4, "fromId"),
-    FROM_OUTPUT_NAME((short)5, "fromOutputName"),
-    /**
-     * 
-     * @see org.apache.airavata.model.workflow.core.ComponentType
-     */
-    TO_TYPE((short)6, "toType"),
-    TO_ID((short)7, "toId"),
-    TO_INPUT_NAME((short)8, "toInputName"),
-    CREATED_AT((short)9, "createdAt"),
-    UPDATED_AT((short)10, "updatedAt");
-
-    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
-
-    static {
-      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ID
-          return ID;
-        case 2: // BELONGS_TO_MAIN_WORKFLOW
-          return BELONGS_TO_MAIN_WORKFLOW;
-        case 3: // FROM_TYPE
-          return FROM_TYPE;
-        case 4: // FROM_ID
-          return FROM_ID;
-        case 5: // FROM_OUTPUT_NAME
-          return FROM_OUTPUT_NAME;
-        case 6: // TO_TYPE
-          return TO_TYPE;
-        case 7: // TO_ID
-          return TO_ID;
-        case 8: // TO_INPUT_NAME
-          return TO_INPUT_NAME;
-        case 9: // CREATED_AT
-          return CREATED_AT;
-        case 10: // UPDATED_AT
-          return UPDATED_AT;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(java.lang.String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final java.lang.String _fieldName;
-
-    _Fields(short thriftId, java.lang.String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public java.lang.String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  private static final int __BELONGSTOMAINWORKFLOW_ISSET_ID = 0;
-  private static final int __CREATEDAT_ISSET_ID = 1;
-  private static final int __UPDATEDAT_ISSET_ID = 2;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.CREATED_AT,_Fields.UPDATED_AT};
-  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.BELONGS_TO_MAIN_WORKFLOW, new org.apache.thrift.meta_data.FieldMetaData("belongsToMainWorkflow", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.FROM_TYPE, new org.apache.thrift.meta_data.FieldMetaData("fromType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workflow.core.ComponentType.class)));
-    tmpMap.put(_Fields.FROM_ID, new org.apache.thrift.meta_data.FieldMetaData("fromId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.FROM_OUTPUT_NAME, new org.apache.thrift.meta_data.FieldMetaData("fromOutputName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TO_TYPE, new org.apache.thrift.meta_data.FieldMetaData("toType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.workflow.core.ComponentType.class)));
-    tmpMap.put(_Fields.TO_ID, new org.apache.thrift.meta_data.FieldMetaData("toId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TO_INPUT_NAME, new org.apache.thrift.meta_data.FieldMetaData("toInputName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.CREATED_AT, new org.apache.thrift.meta_data.FieldMetaData("createdAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.UPDATED_AT, new org.apache.thrift.meta_data.FieldMetaData("updatedAt", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WorkflowConnection.class, metaDataMap);
-  }
-
-  public WorkflowConnection() {
-    this.id = "DO_NOT_SET_AT_CLIENTS";
-
-  }
-
-  public WorkflowConnection(
-    java.lang.String id,
-    boolean belongsToMainWorkflow,
-    org.apache.airavata.model.workflow.core.ComponentType fromType,
-    java.lang.String fromId,
-    java.lang.String fromOutputName,
-    org.apache.airavata.model.workflow.core.ComponentType toType,
-    java.lang.String toId,
-    java.lang.String toInputName)
-  {
-    this();
-    this.id = id;
-    this.belongsToMainWorkflow = belongsToMainWorkflow;
-    setBelongsToMainWorkflowIsSet(true);
-    this.fromType = fromType;
-    this.fromId = fromId;
-    this.fromOutputName = fromOutputName;
-    this.toType = toType;
-    this.toId = toId;
-    this.toInputName = toInputName;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public WorkflowConnection(WorkflowConnection other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetId()) {
-      this.id = other.id;
-    }
-    this.belongsToMainWorkflow = other.belongsToMainWorkflow;
-    if (other.isSetFromType()) {
-      this.fromType = other.fromType;
-    }
-    if (other.isSetFromId()) {
-      this.fromId = other.fromId;
-    }
-    if (other.isSetFromOutputName()) {
-      this.fromOutputName = other.fromOutputName;
-    }
-    if (other.isSetToType()) {
-      this.toType = other.toType;
-    }
-    if (other.isSetToId()) {
-      this.toId = other.toId;
-    }
-    if (other.isSetToInputName()) {
-      this.toInputName = other.toInputName;
-    }
-    this.createdAt = other.createdAt;
-    this.updatedAt = other.updatedAt;
-  }
-
-  public WorkflowConnection deepCopy() {
-    return new WorkflowConnection(this);
-  }
-
-  @Override
-  public void clear() {
-    this.id = "DO_NOT_SET_AT_CLIENTS";
-
-    setBelongsToMainWorkflowIsSet(false);
-    this.belongsToMainWorkflow = false;
-    this.fromType = null;
-    this.fromId = null;
-    this.fromOutputName = null;
-    this.toType = null;
-    this.toId = null;
-    this.toInputName = null;
-    setCreatedAtIsSet(false);
-    this.createdAt = 0;
-    setUpdatedAtIsSet(false);
-    this.updatedAt = 0;
-  }
-
-  public java.lang.String getId() {
-    return this.id;
-  }
-
-  public void setId(java.lang.String id) {
-    this.id = id;
-  }
-
-  public void unsetId() {
-    this.id = null;
-  }
-
-  /** Returns true if field id is set (has been assigned a value) and false otherwise */
-  public boolean isSetId() {
-    return this.id != null;
-  }
-
-  public void setIdIsSet(boolean value) {
-    if (!value) {
-      this.id = null;
-    }
-  }
-
-  public boolean isBelongsToMainWorkflow() {
-    return this.belongsToMainWorkflow;
-  }
-
-  public void setBelongsToMainWorkflow(boolean belongsToMainWorkflow) {
-    this.belongsToMainWorkflow = belongsToMainWorkflow;
-    setBelongsToMainWorkflowIsSet(true);
-  }
-
-  public void unsetBelongsToMainWorkflow() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __BELONGSTOMAINWORKFLOW_ISSET_ID);
-  }
-
-  /** Returns true if field belongsToMainWorkflow is set (has been assigned a value) and false otherwise */
-  public boolean isSetBelongsToMainWorkflow() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __BELONGSTOMAINWORKFLOW_ISSET_ID);
-  }
-
-  public void setBelongsToMainWorkflowIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __BELONGSTOMAINWORKFLOW_ISSET_ID, value);
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.workflow.core.ComponentType
-   */
-  public org.apache.airavata.model.workflow.core.ComponentType getFromType() {
-    return this.fromType;
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.workflow.core.ComponentType
-   */
-  public void setFromType(org.apache.airavata.model.workflow.core.ComponentType fromType) {
-    this.fromType = fromType;
-  }
-
-  public void unsetFromType() {
-    this.fromType = null;
-  }
-
-  /** Returns true if field fromType is set (has been assigned a value) and false otherwise */
-  public boolean isSetFromType() {
-    return this.fromType != null;
-  }
-
-  public void setFromTypeIsSet(boolean value) {
-    if (!value) {
-      this.fromType = null;
-    }
-  }
-
-  public java.lang.String getFromId() {
-    return this.fromId;
-  }
-
-  public void setFromId(java.lang.String fromId) {
-    this.fromId = fromId;
-  }
-
-  public void unsetFromId() {
-    this.fromId = null;
-  }
-
-  /** Returns true if field fromId is set (has been assigned a value) and false otherwise */
-  public boolean isSetFromId() {
-    return this.fromId != null;
-  }
-
-  public void setFromIdIsSet(boolean value) {
-    if (!value) {
-      this.fromId = null;
-    }
-  }
-
-  public java.lang.String getFromOutputName() {
-    return this.fromOutputName;
-  }
-
-  public void setFromOutputName(java.lang.String fromOutputName) {
-    this.fromOutputName = fromOutputName;
-  }
-
-  public void unsetFromOutputName() {
-    this.fromOutputName = null;
-  }
-
-  /** Returns true if field fromOutputName is set (has been assigned a value) and false otherwise */
-  public boolean isSetFromOutputName() {
-    return this.fromOutputName != null;
-  }
-
-  public void setFromOutputNameIsSet(boolean value) {
-    if (!value) {
-      this.fromOutputName = null;
-    }
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.workflow.core.ComponentType
-   */
-  public org.apache.airavata.model.workflow.core.ComponentType getToType() {
-    return this.toType;
-  }
-
-  /**
-   * 
-   * @see org.apache.airavata.model.workflow.core.ComponentType
-   */
-  public void setToType(org.apache.airavata.model.workflow.core.ComponentType toType) {
-    this.toType = toType;
-  }
-
-  public void unsetToType() {
-    this.toType = null;
-  }
-
-  /** Returns true if field toType is set (has been assigned a value) and false otherwise */
-  public boolean isSetToType() {
-    return this.toType != null;
-  }
-
-  public void setToTypeIsSet(boolean value) {
-    if (!value) {
-      this.toType = null;
-    }
-  }
-
-  public java.lang.String getToId() {
-    return this.toId;
-  }
-
-  public void setToId(java.lang.String toId) {
-    this.toId = toId;
-  }
-
-  public void unsetToId() {
-    this.toId = null;
-  }
-
-  /** Returns true if field toId is set (has been assigned a value) and false otherwise */
-  public boolean isSetToId() {
-    return this.toId != null;
-  }
-
-  public void setToIdIsSet(boolean value) {
-    if (!value) {
-      this.toId = null;
-    }
-  }
-
-  public java.lang.String getToInputName() {
-    return this.toInputName;
-  }
-
-  public void setToInputName(java.lang.String toInputName) {
-    this.toInputName = toInputName;
-  }
-
-  public void unsetToInputName() {
-    this.toInputName = null;
-  }
-
-  /** Returns true if field toInputName is set (has been assigned a value) and false otherwise */
-  public boolean isSetToInputName() {
-    return this.toInputName != null;
-  }
-
-  public void setToInputNameIsSet(boolean value) {
-    if (!value) {
-      this.toInputName = null;
-    }
-  }
-
-  public long getCreatedAt() {
-    return this.createdAt;
-  }
-
-  public void setCreatedAt(long createdAt) {
-    this.createdAt = createdAt;
-    setCreatedAtIsSet(true);
-  }
-
-  public void unsetCreatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field createdAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetCreatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATEDAT_ISSET_ID);
-  }
-
-  public void setCreatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATEDAT_ISSET_ID, value);
-  }
-
-  public long getUpdatedAt() {
-    return this.updatedAt;
-  }
-
-  public void setUpdatedAt(long updatedAt) {
-    this.updatedAt = updatedAt;
-    setUpdatedAtIsSet(true);
-  }
-
-  public void unsetUpdatedAt() {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  /** Returns true if field updatedAt is set (has been assigned a value) and false otherwise */
-  public boolean isSetUpdatedAt() {
-    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATEDAT_ISSET_ID);
-  }
-
-  public void setUpdatedAtIsSet(boolean value) {
-    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATEDAT_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, java.lang.Object value) {
-    switch (field) {
-    case ID:
-      if (value == null) {
-        unsetId();
-      } else {
-        setId((java.lang.String)value);
-      }
-      break;
-
-    case BELONGS_TO_MAIN_WORKFLOW:
-      if (value == null) {
-        unsetBelongsToMainWorkflow();
-      } else {
-        setBelongsToMainWorkflow((java.lang.Boolean)value);
-      }
-      break;
-
-    case FROM_TYPE:
-      if (value == null) {
-        unsetFromType();
-      } else {
-        setFromType((org.apache.airavata.model.workflow.core.ComponentType)value);
-      }
-      break;
-
-    case FROM_ID:
-      if (value == null) {
-        unsetFromId();
-      } else {
-        setFromId((java.lang.String)value);
-      }
-      break;
-
-    case FROM_OUTPUT_NAME:
-      if (value == null) {
-        unsetFromOutputName();
-      } else {
-        setFromOutputName((java.lang.String)value);
-      }
-      break;
-
-    case TO_TYPE:
-      if (value == null) {
-        unsetToType();
-      } else {
-        setToType((org.apache.airavata.model.workflow.core.ComponentType)value);
-      }
-      break;
-
-    case TO_ID:
-      if (value == null) {
-        unsetToId();
-      } else {
-        setToId((java.lang.String)value);
-      }
-      break;
-
-    case TO_INPUT_NAME:
-      if (value == null) {
-        unsetToInputName();
-      } else {
-        setToInputName((java.lang.String)value);
-      }
-      break;
-
-    case CREATED_AT:
-      if (value == null) {
-        unsetCreatedAt();
-      } else {
-        setCreatedAt((java.lang.Long)value);
-      }
-      break;
-
-    case UPDATED_AT:
-      if (value == null) {
-        unsetUpdatedAt();
-      } else {
-        setUpdatedAt((java.lang.Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public java.lang.Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ID:
-      return getId();
-
-    case BELONGS_TO_MAIN_WORKFLOW:
-      return isBelongsToMainWorkflow();
-
-    case FROM_TYPE:
-      return getFromType();
-
-    case FROM_ID:
-      return getFromId();
-
-    case FROM_OUTPUT_NAME:
-      return getFromOutputName();
-
-    case TO_TYPE:
-      return getToType();
-
-    case TO_ID:
-      return getToId();
-
-    case TO_INPUT_NAME:
-      return getToInputName();
-
-    case CREATED_AT:
-      return getCreatedAt();
-
-    case UPDATED_AT:
-      return getUpdatedAt();
-
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new java.lang.IllegalArgumentException();
-    }
-
-    switch (field) {
-    case ID:
-      return isSetId();
-    case BELONGS_TO_MAIN_WORKFLOW:
-      return isSetBelongsToMainWorkflow();
-    case FROM_TYPE:
-      return isSetFromType();
-    case FROM_ID:
-      return isSetFromId();
-    case FROM_OUTPUT_NAME:
-      return isSetFromOutputName();
-    case TO_TYPE:
-      return isSetToType();
-    case TO_ID:
-      return isSetToId();
-    case TO_INPUT_NAME:
-      return isSetToInputName();
-    case CREATED_AT:
-      return isSetCreatedAt();
-    case UPDATED_AT:
-      return isSetUpdatedAt();
-    }
-    throw new java.lang.IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(java.lang.Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof WorkflowConnection)
-      return this.equals((WorkflowConnection)that);
-    return false;
-  }
-
-  public boolean equals(WorkflowConnection that) {
-    if (that == null)
-      return false;
-    if (this == that)
-      return true;
-
-    boolean this_present_id = true && this.isSetId();
-    boolean that_present_id = true && that.isSetId();
-    if (this_present_id || that_present_id) {
-      if (!(this_present_id && that_present_id))
-        return false;
-      if (!this.id.equals(that.id))
-        return false;
-    }
-
-    boolean this_present_belongsToMainWorkflow = true;
-    boolean that_present_belongsToMainWorkflow = true;
-    if (this_present_belongsToMainWorkflow || that_present_belongsToMainWorkflow) {
-      if (!(this_present_belongsToMainWorkflow && that_present_belongsToMainWorkflow))
-        return false;
-      if (this.belongsToMainWorkflow != that.belongsToMainWorkflow)
-        return false;
-    }
-
-    boolean this_present_fromType = true && this.isSetFromType();
-    boolean that_present_fromType = true && that.isSetFromType();
-    if (this_present_fromType || that_present_fromType) {
-      if (!(this_present_fromType && that_present_fromType))
-        return false;
-      if (!this.fromType.equals(that.fromType))
-        return false;
-    }
-
-    boolean this_present_fromId = true && this.isSetFromId();
-    boolean that_present_fromId = true && that.isSetFromId();
-    if (this_present_fromId || that_present_fromId) {
-      if (!(this_present_fromId && that_present_fromId))
-        return false;
-      if (!this.fromId.equals(that.fromId))
-        return false;
-    }
-
-    boolean this_present_fromOutputName = true && this.isSetFromOutputName();
-    boolean that_present_fromOutputName = true && that.isSetFromOutputName();
-    if (this_present_fromOutputName || that_present_fromOutputName) {
-      if (!(this_present_fromOutputName && that_present_fromOutputName))
-        return false;
-      if (!this.fromOutputName.equals(that.fromOutputName))
-        return false;
-    }
-
-    boolean this_present_toType = true && this.isSetToType();
-    boolean that_present_toType = true && that.isSetToType();
-    if (this_present_toType || that_present_toType) {
-      if (!(this_present_toType && that_present_toType))
-        return false;
-      if (!this.toType.equals(that.toType))
-        return false;
-    }
-
-    boolean this_present_toId = true && this.isSetToId();
-    boolean that_present_toId = true && that.isSetToId();
-    if (this_present_toId || that_present_toId) {
-      if (!(this_present_toId && that_present_toId))
-        return false;
-      if (!this.toId.equals(that.toId))
-        return false;
-    }
-
-    boolean this_present_toInputName = true && this.isSetToInputName();
-    boolean that_present_toInputName = true && that.isSetToInputName();
-    if (this_present_toInputName || that_present_toInputName) {
-      if (!(this_present_toInputName && that_present_toInputName))
-        return false;
-      if (!this.toInputName.equals(that.toInputName))
-        return false;
-    }
-
-    boolean this_present_createdAt = true && this.isSetCreatedAt();
-    boolean that_present_createdAt = true && that.isSetCreatedAt();
-    if (this_present_createdAt || that_present_createdAt) {
-      if (!(this_present_createdAt && that_present_createdAt))
-        return false;
-      if (this.createdAt != that.createdAt)
-        return false;
-    }
-
-    boolean this_present_updatedAt = true && this.isSetUpdatedAt();
-    boolean that_present_updatedAt = true && that.isSetUpdatedAt();
-    if (this_present_updatedAt || that_present_updatedAt) {
-      if (!(this_present_updatedAt && that_present_updatedAt))
-        return false;
-      if (this.updatedAt != that.updatedAt)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 1;
-
-    hashCode = hashCode * 8191 + ((isSetId()) ? 131071 : 524287);
-    if (isSetId())
-      hashCode = hashCode * 8191 + id.hashCode();
-
-    hashCode = hashCode * 8191 + ((belongsToMainWorkflow) ? 131071 : 524287);
-
-    hashCode = hashCode * 8191 + ((isSetFromType()) ? 131071 : 524287);
-    if (isSetFromType())
-      hashCode = hashCode * 8191 + fromType.getValue();
-
-    hashCode = hashCode * 8191 + ((isSetFromId()) ? 131071 : 524287);
-    if (isSetFromId())
-      hashCode = hashCode * 8191 + fromId.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetFromOutputName()) ? 131071 : 524287);
-    if (isSetFromOutputName())
-      hashCode = hashCode * 8191 + fromOutputName.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetToType()) ? 131071 : 524287);
-    if (isSetToType())
-      hashCode = hashCode * 8191 + toType.getValue();
-
-    hashCode = hashCode * 8191 + ((isSetToId()) ? 131071 : 524287);
-    if (isSetToId())
-      hashCode = hashCode * 8191 + toId.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetToInputName()) ? 131071 : 524287);
-    if (isSetToInputName())
-      hashCode = hashCode * 8191 + toInputName.hashCode();
-
-    hashCode = hashCode * 8191 + ((isSetCreatedAt()) ? 131071 : 524287);
-    if (isSetCreatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createdAt);
-
-    hashCode = hashCode * 8191 + ((isSetUpdatedAt()) ? 131071 : 524287);
-    if (isSetUpdatedAt())
-      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updatedAt);
-
-    return hashCode;
-  }
-
-  @Override
-  public int compareTo(WorkflowConnection other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = java.lang.Boolean.valueOf(isSetId()).compareTo(other.isSetId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetBelongsToMainWorkflow()).compareTo(other.isSetBelongsToMainWorkflow());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetBelongsToMainWorkflow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.belongsToMainWorkflow, other.belongsToMainWorkflow);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetFromType()).compareTo(other.isSetFromType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFromType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fromType, other.fromType);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetFromId()).compareTo(other.isSetFromId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFromId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fromId, other.fromId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetFromOutputName()).compareTo(other.isSetFromOutputName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFromOutputName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fromOutputName, other.fromOutputName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetToType()).compareTo(other.isSetToType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetToType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.toType, other.toType);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetToId()).compareTo(other.isSetToId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetToId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.toId, other.toId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetToInputName()).compareTo(other.isSetToInputName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetToInputName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.toInputName, other.toInputName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetCreatedAt()).compareTo(other.isSetCreatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCreatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createdAt, other.createdAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = java.lang.Boolean.valueOf(isSetUpdatedAt()).compareTo(other.isSetUpdatedAt());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUpdatedAt()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updatedAt, other.updatedAt);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    scheme(iprot).read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    scheme(oprot).write(oprot, this);
-  }
-
-  @Override
-  public java.lang.String toString() {
-    java.lang.StringBuilder sb = new java.lang.StringBuilder("WorkflowConnection(");
-    boolean first = true;
-
-    sb.append("id:");
-    if (this.id == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.id);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("belongsToMainWorkflow:");
-    sb.append(this.belongsToMainWorkflow);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("fromType:");
-    if (this.fromType == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.fromType);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("fromId:");
-    if (this.fromId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.fromId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("fromOutputName:");
-    if (this.fromOutputName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.fromOutputName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("toType:");
-    if (this.toType == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.toType);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("toId:");
-    if (this.toId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.toId);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("toInputName:");
-    if (this.toInputName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.toInputName);
-    }
-    first = false;
-    if (isSetCreatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("createdAt:");
-      sb.append(this.createdAt);
-      first = false;
-    }
-    if (isSetUpdatedAt()) {
-      if (!first) sb.append(", ");
-      sb.append("updatedAt:");
-      sb.append(this.updatedAt);
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'id' is unset! Struct:" + toString());
-    }
-
-    if (!isSetBelongsToMainWorkflow()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'belongsToMainWorkflow' is unset! Struct:" + toString());
-    }
-
-    if (!isSetFromType()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'fromType' is unset! Struct:" + toString());
-    }
-
-    if (!isSetFromId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'fromId' is unset! Struct:" + toString());
-    }
-
-    if (!isSetFromOutputName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'fromOutputName' is unset! Struct:" + toString());
-    }
-
-    if (!isSetToType()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'toType' is unset! Struct:" + toString());
-    }
-
-    if (!isSetToId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'toId' is unset! Struct:" + toString());
-    }
-
-    if (!isSetToInputName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'toInputName' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
-    try {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class WorkflowConnectionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
-    public WorkflowConnectionStandardScheme getScheme() {
-      return new WorkflowConnectionStandardScheme();
-    }
-  }
-
-  private static class WorkflowConnectionStandardScheme extends org.apache.thrift.scheme.StandardScheme<WorkflowConnection> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, WorkflowConnection struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.id = iprot.readString();
-              struct.setIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // BELONGS_TO_MAIN_WORKFLOW
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.belongsToMainWorkflow = iprot.readBool();
-              struct.setBelongsToMainWorkflowIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
... 10559 lines suppressed ...