diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
index be827c2270..d2f0787108 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowDefinition.java
@@ -93,6 +93,7 @@ public class WorkflowDefinition implements Serializable
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return "WorkflowDefinition[id=" + id + ",name=" + name + ",version=" + version + ",title=" + title + ",startTask=" + ((getStartTaskDefinition() == null) ? "undefined" : getStartTaskDefinition().toString()) + "]";
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java
index bb75613489..9abd4a0220 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowDeployment.java
@@ -32,9 +32,26 @@ public class WorkflowDeployment
     /** Workflow Status */
     public String[] problems;
     
+    /**
+     * @return the definition
+     */
+    public WorkflowDefinition getDefinition()
+    {
+        return definition;
+    }
+
+    /**
+     * @return the problems
+     */
+    public String[] getProblems()
+    {
+        return problems;
+    }
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return "WorkflowDeployment[def=" + definition + ",problems=" + ((problems == null) ? 0 : problems.length) + "]";
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java
index 14d6b95144..ea61634e98 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowInstance.java
@@ -62,9 +62,90 @@ public class WorkflowInstance implements Serializable
     /** Workflow Definition */
     public WorkflowDefinition definition;
 
+    /**
+     * @return the serialversionuid
+     */
+    public static long getSerialversionuid()
+    {
+        return serialVersionUID;
+    }
+
+    /**
+     * @return the id
+     */
+    public String getId()
+    {
+        return id;
+    }
+
+    /**
+     * @return the description
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * @return the active
+     */
+    public boolean isActive()
+    {
+        return active;
+    }
+
+    /**
+     * @return the initiator
+     */
+    public NodeRef getInitiator()
+    {
+        return initiator;
+    }
+
+    /**
+     * @return the startDate
+     */
+    public Date getStartDate()
+    {
+        return startDate;
+    }
+
+    /**
+     * @return the endDate
+     */
+    public Date getEndDate()
+    {
+        return endDate;
+    }
+
+    /**
+     * @return the workflowPackage
+     */
+    public NodeRef getWorkflowPackage()
+    {
+        return workflowPackage;
+    }
+
+    /**
+     * @return the context
+     */
+    public NodeRef getContext()
+    {
+        return context;
+    }
+
+    /**
+     * @return the definition
+     */
+    public WorkflowDefinition getDefinition()
+    {
+        return definition;
+    }
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return "WorkflowInstance[id=" + id + ",active=" + active + ",def=" + definition.toString() + "]";
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowNode.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowNode.java
index 9735f39ec8..45512a6071 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowNode.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowNode.java
@@ -46,10 +46,58 @@ public class WorkflowNode
     /** The transitions leaving this node (or null, if none) */
     public WorkflowTransition[] transitions;
     
-    
+    /**
+     * @return the name
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * @return the title
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+    /**
+     * @return the description
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * @return the type
+     */
+    public String getType()
+    {
+        return type;
+    }
+
+    /**
+     * @return the isTaskNode
+     */
+    public boolean isTaskNode()
+    {
+        return isTaskNode;
+    }
+
+    /**
+     * @return the transitions
+     */
+    public WorkflowTransition[] getTransitions()
+    {
+        return transitions;
+    }
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         String transitionsArray = "{";
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowPath.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowPath.java
index 043bf5f7cd..85e18803ce 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowPath.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowPath.java
@@ -43,10 +43,42 @@ public class WorkflowPath
     /** Is the path still active? */
     public boolean active;
 
-    
+    /**
+     * @return the id
+     */
+    public String getId()
+    {
+        return id;
+    }
+
+    /**
+     * @return the instance
+     */
+    public WorkflowInstance getInstance()
+    {
+        return instance;
+    }
+
+    /**
+     * @return the node
+     */
+    public WorkflowNode getNode()
+    {
+        return node;
+    }
+
+    /**
+     * @return the active
+     */
+    public boolean isActive()
+    {
+        return active;
+    }
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return "WorkflowPath[id=" + id + ",instance=" + instance.toString() + ",active=" + active + ",node=" + node.toString()+ "]";
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowTask.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowTask.java
index 56f1a9e27d..7eb014791e 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowTask.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowTask.java
@@ -57,9 +57,74 @@ public class WorkflowTask
     /** Task Properties as described by Task Definition */
     public Map<QName, Serializable> properties;
     
+    /**
+     * @return the id
+     */
+    public String getId()
+    {
+        return id;
+    }
+    
+    /**
+     * @return the name
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * @return the title
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+    /**
+     * @return the description
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+
+    /**
+     * @return the state
+     */
+    public WorkflowTaskState getState()
+    {
+        return state;
+    }
+
+    /**
+     * @return the path
+     */
+    public WorkflowPath getPath()
+    {
+        return path;
+    }
+
+    /**
+     * @return the definition
+     */
+    public WorkflowTaskDefinition getDefinition()
+    {
+        return definition;
+    }
+
+    /**
+     * @return the properties
+     */
+    public Map<QName, Serializable> getProperties()
+    {
+        return properties;
+    }
+
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         String propCount = (properties == null) ? "null" : "" + properties.size();
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java
index 538294e53b..e5aedd6ccc 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowTaskQuery.java
@@ -65,8 +65,8 @@ public class WorkflowTaskQuery
         TaskActor_Asc,
         TaskActor_Desc,
         TaskState_Asc,
-        TaskState_Desc
-    };
+        TaskState_Desc;
+    }
     
     
     /**
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java
index 4fdb49f496..d68e43a68b 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowTimer.java
@@ -40,11 +40,60 @@ public class WorkflowTimer
     /** Error */
     public String error;
     
+    /**
+     * @return the id
+     */
+    public String getId()
+    {
+        return id;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * @return the path
+     */
+    public WorkflowPath getPath()
+    {
+        return path;
+    }
+
+    /**
+     * @return the task
+     */
+    public WorkflowTask getTask()
+    {
+        return task;
+    }
+
+    /**
+     * @return the dueDate
+     */
+    public Date getDueDate()
+    {
+        return dueDate;
+    }
+
+    /**
+     * @return the error
+     */
+    public String getError()
+    {
+        return error;
+    }
+
     /*
      * (non-Javadoc)
      * 
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return "WorkflowTimer[id=" + id + ",name=" + name + ",dueDate=" + dueDate + ",path=" + path + ",task=" + task + "]";
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java
index a7259f6626..b2e8e707a7 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowTransition.java
@@ -38,9 +38,43 @@ public class WorkflowTransition
     /** Is this the default transition */
     public boolean isDefault;
     
+    
+    /**
+     * @return the id
+     */
+    public String getId()
+    {
+        return id;
+    }
+    
+    /**
+     * @return the title
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+    
+    /**
+     * @return the description
+     */
+    public String getDescription()
+    {
+        return description;
+    }
+    
+    /**
+     * @return the isDefault
+     */
+    public boolean isDefault()
+    {
+        return isDefault;
+    }
+    
     /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
+    @Override
     public String toString()
     {
         return "WorkflowTransition[id=" + id + ",title=" + title + "]";