diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java
index a4d9d77..ae5d671 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java
@@ -228,7 +228,7 @@ public class Common {
 		this.resources = resources;
 	}
 
-	public void setProperties(Map<String, String> extras) {
+	public void setExtras(Map<String, String> extras) {
 		this.extras = extras;
 	}
 
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java
index 3876292..f0520ab 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java
@@ -85,6 +85,7 @@ public abstract class HelperMethods {
 						Object f = new PropertyDescriptor(field.getName(), current).getReadMethod().invoke(record);
 						if(f != null){
 
+							// also convert to the group name that should be on ckan
 							groups.add(getGroupNameOnCkan(f.toString()));
 
 						}
@@ -111,7 +112,7 @@ public abstract class HelperMethods {
 						if(f != null){
 
 							// get the key to put into the map first
-							extras.put(field.getAnnotation(CustomField.class).key(), f);
+							extras.put(field.getAnnotation(CustomField.class).key(), f.toString());
 
 						}
 					}catch(Exception e){
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java
index da7ec49..2d368f5 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Abundance_Level.java
@@ -1,7 +1,5 @@
 package org.gcube.data_catalogue.grsf_publish_ws.utils.groups;
 
-import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -16,19 +14,9 @@ public enum Abundance_Level {
 	Uncertain_Not_Assessed("Uncertain/Not assessed");
 
 	private String subGroupNameOrig;
-	private String subGroupNameOnCkan;
 
 	private Abundance_Level(String origName) {
 		this.subGroupNameOrig = origName;
-		this.subGroupNameOnCkan = HelperMethods.getGroupNameOnCkan(origName);
-	}
-
-	/**
-	 * Return the name the group has on ckan
-	 * @return
-	 */
-	public String getNameCkan(){
-		return subGroupNameOnCkan;
 	}
 
 	/**
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java
index f5a8125..23d335d 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Exploitation_Rate.java
@@ -1,9 +1,6 @@
 package org.gcube.data_catalogue.grsf_publish_ws.utils.groups;
 
-import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
  * Exploitation_Rate for Stock records
@@ -20,7 +17,6 @@ public enum Exploitation_Rate {
 
 	private Exploitation_Rate(String origName) {
 		this.subGroupNameOrig = origName;
-		this.subGroupNameOnCkan = HelperMethods.getGroupNameOnCkan(origName);
 	}
 
 	/**
@@ -39,11 +35,6 @@ public enum Exploitation_Rate {
 		return subGroupNameOrig;
 	}
 
-	@JsonValue
-	public String onSerialize(){
-		return subGroupNameOrig.toLowerCase();
-	}
-
 	@JsonCreator
 	public static Exploitation_Rate onDeserialize(String exploitationString) {
 		if(exploitationString != null) {
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Production_System_Type.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Production_System_Type.java
index fe7eb4c..ba4a103 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Production_System_Type.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Production_System_Type.java
@@ -1,7 +1,5 @@
 package org.gcube.data_catalogue.grsf_publish_ws.utils.groups;
 
-import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -21,19 +19,9 @@ public enum Production_System_Type {
 	Unspecified("Unspecified");
 
 	private String subGroupNameOrig;
-	private String subGroupNameOnCkan;
 
 	private Production_System_Type(String origName) {
 		this.subGroupNameOrig = origName;
-		this.subGroupNameOnCkan = HelperMethods.getGroupNameOnCkan(origName);
-	}
-
-	/**
-	 * Return the name the group has on ckan
-	 * @return
-	 */
-	public String getNameCkan(){
-		return subGroupNameOnCkan;
 	}
 
 	/**
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Source.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Source.java
index d80cf78..da76c5e 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Source.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Source.java
@@ -1,7 +1,5 @@
 package org.gcube.data_catalogue.grsf_publish_ws.utils.groups;
 
-import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -16,19 +14,9 @@ public enum Source {
 	FISHSOURCE("FishSource");
 
 	private String subGroupNameOrig;
-	private String subGroupNameOnCkan;
 
 	private Source(String origName) {
 		this.subGroupNameOrig = origName;
-		this.subGroupNameOnCkan = HelperMethods.getGroupNameOnCkan(origName);
-	}
-
-	/**
-	 * Return the name the group has on ckan
-	 * @return
-	 */
-	public String getNameCkan(){
-		return subGroupNameOnCkan;
 	}
 
 	/**
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Status.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Status.java
index 42ef029..e824c90 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Status.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Status.java
@@ -1,7 +1,5 @@
 package org.gcube.data_catalogue.grsf_publish_ws.utils.groups;
 
-import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -15,19 +13,9 @@ public enum Status {
 	Confirmed("Confirmed");
 
 	private String subGroupNameOrig;
-	private String subGroupNameOnCkan;
 
 	private Status(String origName) {
 		this.subGroupNameOrig = origName;
-		this.subGroupNameOnCkan = HelperMethods.getGroupNameOnCkan(origName);
-	}
-
-	/**
-	 * Return the name the group has on ckan
-	 * @return
-	 */
-	public String getNameCkan(){
-		return subGroupNameOnCkan;
 	}
 
 	/**
@@ -38,11 +26,20 @@ public enum Status {
 		return subGroupNameOrig;
 	}
 	
+	/**
+	 * Get the json value
+	 * @return
+	 */
 	@JsonValue
 	public String onSerialize(){
 		return subGroupNameOrig.toLowerCase();
 	}
 
+	/**
+	 * Get back an enum from json string
+	 * @param statusString
+	 * @return
+	 */
 	@JsonCreator
 	public static Status onDeserialize(String statusString) {
 		if(statusString != null) {
@@ -54,6 +51,9 @@ public enum Status {
 		return null;
 	}
 	
+	/**
+	 * Used by reflection 
+	 */
 	@Override
 	public String toString() {
 		return getOrigName();
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java
index f332772..1a2cff5 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/groups/Type.java
@@ -1,7 +1,5 @@
 package org.gcube.data_catalogue.grsf_publish_ws.utils.groups;
 
-import org.gcube.data_catalogue.grsf_publish_ws.utils.HelperMethods;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
@@ -18,19 +16,9 @@ public enum Type {
 	Fishing_Description("Fishing Description"); // for fishery
 
 	private String subGroupNameOrig;
-	private String subGroupNameOnCkan;
 
 	private Type(String origName) {
 		this.subGroupNameOrig = origName;
-		this.subGroupNameOnCkan = HelperMethods.getGroupNameOnCkan(origName);
-	}
-
-	/**
-	 * Return the name the group has on ckan
-	 * @return
-	 */
-	public String getNameCkan(){
-		return subGroupNameOnCkan;
 	}
 
 	/**
@@ -41,11 +29,20 @@ public enum Type {
 		return subGroupNameOrig;
 	}
 
+	/**
+	 * Get the json value
+	 * @return
+	 */
 	@JsonValue
 	public String onSerialize(){
 		return subGroupNameOrig.toLowerCase();
 	}
 
+	/**
+	 * Get back an enum from json string
+	 * @param typeString
+	 * @return
+	 */
 	@JsonCreator
 	public static Type onDeserialize(String typeString) {
 		if(typeString != null) {
@@ -57,6 +54,9 @@ public enum Type {
 		return null;
 	}
 	
+	/**
+	 * Used by reflection
+	 */
 	@Override
 	public String toString() {
 		return getOrigName();