=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java	2015-08-31 04:36:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java	2015-08-31 05:16:43 +0000
@@ -29,7 +29,6 @@
  */
 
 import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.option.OptionSet;
 import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
 import org.hisp.dhis.trackedentity.TrackedEntityInstance;
 
@@ -57,7 +56,7 @@
     INTEGER_NEGATIVE( Integer.class ),
     INTEGER_ZERO_OR_POSITIVE( Integer.class ),
     TRACKER_ASSOCIATE( TrackedEntityInstance.class ),
-    OPTION_SET( OptionSet.class ),
+    OPTION_SET( String.class ),
     USERNAME( String.class );
 
     private final Class<?> javaClass;