Index: /issm/trunk/src/m/classes/model/modelfield.m
===================================================================
--- /issm/trunk/src/m/classes/model/modelfield.m	(revision 9682)
+++ /issm/trunk/src/m/classes/model/modelfield.m	(revision 9683)
@@ -11,4 +11,6 @@
 		format='Int';
 		mattype=0;
+		parameters=false;
+		enum=NoneEnum;
 	end
 	methods
Index: /issm/trunk/src/m/model/marshall.m
===================================================================
--- /issm/trunk/src/m/model/marshall.m	(revision 9682)
+++ /issm/trunk/src/m/model/marshall.m	(revision 9683)
@@ -63,5 +63,10 @@
 %first recover data, enum of the data and type of data
 data=fieldvalue;
-enum=BuildEnum(fieldname);
+if fieldprop.enum==NoneEnum,
+	enum=BuildEnum(fieldname);
+else
+	%Field enum overloaded
+	enum=fieldprop.enum;
+end
 data_type=fieldprop.format;