diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
index 74a293728f..74b584a8d4 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
@@ -1785,18 +1785,18 @@ public class JBPMEngine extends BPMEngine
      */
     protected WorkflowDefinition createWorkflowDefinition(ProcessDefinition definition)
     {
-        WorkflowDefinition workflowDef = new WorkflowDefinition();
-        workflowDef.id = createGlobalId(new Long(definition.getId()).toString());
-        workflowDef.name = definition.getName();
-        workflowDef.title = getLabel(workflowDef.name + ".workflow", TITLE_LABEL, workflowDef.name);
-        workflowDef.description = getLabel(workflowDef.name + ".workflow", DESC_LABEL, workflowDef.title);
-        workflowDef.version = new Integer(definition.getVersion()).toString();
-        Task startTask = definition.getTaskMgmtDefinition().getStartTask();
-        if (startTask != null)
-        {
-            workflowDef.startTaskDefinition = createWorkflowTaskDefinition(startTask);
-        }
-        return workflowDef;
+        final Task startTask = definition.getTaskMgmtDefinition().getStartTask();
+        final String name = definition.getName();
+        final String title = getLabel(name + ".workflow", TITLE_LABEL, name);
+        final String description = getLabel(name + ".workflow", DESC_LABEL, title);
+        return new WorkflowDefinition(createGlobalId(new Long(definition.getId()).toString()),
+                                      name,
+                                      new Integer(definition.getVersion()).toString(),
+                                      title,
+                                      description,
+                                      (startTask != null
+                                       ? createWorkflowTaskDefinition(startTask)
+                                       : null));
     }
     
     /**
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
index 2f709f2319..4c970679e6 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
@@ -24,30 +24,71 @@ package org.alfresco.service.cmr.workflow;
  */
 public class WorkflowDefinition
 {
-    /** Workflow Definition unique id */
-    public String id;
-    
-    /** Workflow Definition name */
-    public String name;
-    
-    /** Workflow Definition version */
-    public String version;
-    
-    /** Workflow Definition Title (Localised) */
-    public String title;
-    
-    /** Workflow Definition Description (Localised) */
-    public String description;
-    
-    /** Task Definition for Workflow Start Task (Optional) */
-    public WorkflowTaskDefinition startTaskDefinition;
+   //XXarielb these should most likely all be private
+   public final String id;
+   public final String name;
+   public final String version;
+   public final String title;
+   public final String description;
+   public final WorkflowTaskDefinition startTaskDefinition;
 
+   public WorkflowDefinition(final String id,
+                             final String name,
+                             final String version,
+                             final String title,
+                             final String description,
+                             final WorkflowTaskDefinition startTaskDefinition)
+   {
+      this.id = id;
+      this.name = name;
+      this.version = version;
+      this.title = title;
+      this.description = description;
+      this.startTaskDefinition = startTaskDefinition;
+   }
+   
+   /** Workflow Definition unique id */
+   public String getId()
+   {
+      return this.id;
+   }
     
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return "WorkflowDefinition[id=" + id + ",version=" + version + ",title=" + title + ",startTask=" + startTaskDefinition.toString() + "]";
-    }
+
+   /** Workflow Definition name */
+   public String getName()
+   {
+      return this.name;
+   }
+    
+   /** Workflow Definition version */
+   public String getVersion()
+   {
+      return this.version;
+   }
+    
+   /** Workflow Definition Title (Localised) */
+   public String getTitle()
+   {
+      return this.title;
+   }
+    
+   /** Workflow Definition Description (Localised) */
+   public String getDescription()
+   {
+      return this.description;
+   }
+
+   /** Task Definition for Workflow Start Task (Optional) */
+   public WorkflowTaskDefinition getStartTaskDefinition()
+   {
+      return this.startTaskDefinition;
+   }
+    
+   /* (non-Javadoc)
+    * @see java.lang.Object#toString()
+    */
+   public String toString()
+   {
+      return "WorkflowDefinition[id=" + id + ",version=" + version + ",title=" + title + ",startTask=" + startTaskDefinition.toString() + "]";
+   }
 }