diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java b/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java
index eebc5df..09522dc 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java
@@ -7,7 +7,7 @@
  */
 public interface PropertyNames {
 
-//    String DESCRIPTOR = "descriptor";
+    String DESCRIPTOR = "descriptor";
 
     String CONTROL = "control";
 
@@ -131,6 +131,8 @@ public interface PropertyNames {
 
     String FORM = "form";
 
+    String DATA = "data";
+
     String CONTROL_DATA = "controlData";
 
     String FIELD = "field";
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/EntityNameControlData.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/EntityNameControlData.java
index 7dfaea6..116ba10 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/EntityNameControlData.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/EntityNameControlData.java
@@ -1,9 +1,6 @@
 package edu.stanford.protege.webprotege.forms.data;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.PropertyName;
 import com.google.auto.value.AutoValue;
 import com.google.common.annotations.GwtCompatible;
@@ -25,7 +22,7 @@
 public abstract class EntityNameControlData implements FormControlData {
 
     @JsonCreator
-    public static EntityNameControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull EntityNameControlDescriptor descriptor,
+    public static EntityNameControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull EntityNameControlDescriptor descriptor,
                                             @JsonProperty(PropertyNames.ENTITY) @Nullable OWLEntity entity) {
         return new AutoValue_EntityNameControlData(descriptor, entity);
     }
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/GridControlData.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/GridControlData.java
index 5a7bf9d..9ec0ff7 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/GridControlData.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/GridControlData.java
@@ -22,7 +22,7 @@ public abstract class GridControlData implements ComplexFormControlValue {
 
     @JsonCreator
     @Nonnull
-    public static GridControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull GridControlDescriptor descriptor,
+    public static GridControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull GridControlDescriptor descriptor,
                                       @JsonProperty(PropertyNames.ROWS) @Nonnull Page<GridRowData> rows,
                                       @JsonProperty(PropertyNames.ORDERING) @Nonnull ImmutableSet<FormRegionOrdering> ordering) {
         return new AutoValue_GridControlData(descriptor, rows, ordering);
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/GridRowData.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/GridRowData.java
index 2fb0750..314dec1 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/GridRowData.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/GridRowData.java
@@ -1,6 +1,8 @@
 package edu.stanford.protege.webprotege.forms.data;
 
-import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import edu.stanford.protege.webprotege.forms.PropertyNames;
@@ -17,6 +19,7 @@
 @AutoValue
 public abstract class GridRowData implements Comparable<GridRowData> {
 
+    @JsonCreator
     public static GridRowData get(@JsonProperty(PropertyNames.SUBJECT) @Nullable FormEntitySubject subject,
                                   @JsonProperty(PropertyNames.CELLS) @Nonnull ImmutableList<GridCellData> cellData) {
         return new AutoValue_GridRowData(subject, cellData);
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/MultiChoiceControlData.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/MultiChoiceControlData.java
index 467a499..e3a5bb6 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/MultiChoiceControlData.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/MultiChoiceControlData.java
@@ -1,5 +1,6 @@
 package edu.stanford.protege.webprotege.forms.data;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.auto.value.AutoValue;
@@ -19,6 +20,7 @@
 @JsonTypeName("MultiChoiceControlData")
 public abstract class MultiChoiceControlData implements FormControlData {
 
+    @JsonCreator
     public static MultiChoiceControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull MultiChoiceControlDescriptor descriptor,
                                              @JsonProperty(PropertyNames.VALUES) @Nonnull ImmutableList<PrimitiveFormControlData> values) {
         return new AutoValue_MultiChoiceControlData(descriptor, values);
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/NumberControlData.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/NumberControlData.java
index 57c50c4..4f0a088 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/NumberControlData.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/NumberControlData.java
@@ -1,9 +1,6 @@
 package edu.stanford.protege.webprotege.forms.data;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.*;
 import com.google.auto.value.AutoValue;
 import edu.stanford.protege.webprotege.forms.PropertyNames;
 import edu.stanford.protege.webprotege.forms.field.NumberControlDescriptor;
@@ -24,7 +21,7 @@
 public abstract class NumberControlData implements FormControlData {
 
     @JsonCreator
-    public static NumberControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull NumberControlDescriptor descriptor,
+    public static NumberControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull NumberControlDescriptor descriptor,
                                         @JsonProperty(PropertyNames.VALUE) @Nullable OWLLiteral value) {
         return new AutoValue_NumberControlData(descriptor, value);
     }
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/SingleChoiceControlData.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/SingleChoiceControlData.java
index faf02e6..f8f7646 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/SingleChoiceControlData.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/SingleChoiceControlData.java
@@ -20,7 +20,7 @@
 public abstract class SingleChoiceControlData implements FormControlData {
 
     @JsonCreator
-    public static SingleChoiceControlData get(@JsonProperty(PropertyNames.CONTROL) @Nonnull SingleChoiceControlDescriptor descriptor,
+    public static SingleChoiceControlData get(@JsonProperty(PropertyNames.CONTROL) @JsonAlias(PropertyNames.DESCRIPTOR) @Nonnull SingleChoiceControlDescriptor descriptor,
                                               @JsonProperty(PropertyNames.CHOICE) @Nullable PrimitiveFormControlData choice) {
 
         return new AutoValue_SingleChoiceControlData(descriptor, choice);
@@ -38,6 +38,7 @@ public void accept(@Nonnull FormControlDataVisitor visitor) {
 
     @JsonProperty(PropertyNames.CONTROL)
     @Nonnull
+    @JsonAlias(PropertyNames.DESCRIPTOR)
     public abstract SingleChoiceControlDescriptor getDescriptor();
 
     @JsonProperty(PropertyNames.CHOICE)