diff --git a/model/src/main/java/org/gluu/oxtrust/model/GluuCustomAttribute.java b/model/src/main/java/org/gluu/oxtrust/model/GluuCustomAttribute.java
index e5d8577ea..d03d98173 100644
--- a/model/src/main/java/org/gluu/oxtrust/model/GluuCustomAttribute.java
+++ b/model/src/main/java/org/gluu/oxtrust/model/GluuCustomAttribute.java
@@ -6,6 +6,7 @@
 
 package org.gluu.oxtrust.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import java.io.Serializable;
@@ -17,6 +18,7 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 
 import org.gluu.persist.model.base.GluuBoolean;
 import org.xdi.model.GluuAttribute;
@@ -152,6 +154,8 @@ public void setBooleanValues(GluuBoolean[] booleanValues) {
 		this.booleanValues = booleanValues;
 	}
         
+        @JsonIgnore
+        @XmlTransient
 	public void setValues(String[] values) {
 		this.values = values;
 	}
@@ -162,6 +166,8 @@ public void setValues(Collection<String> values) {
 	}
 
 	// To avoid extra code in CR interceptor script
+        @JsonIgnore
+        @XmlTransient
 	public void setValues(Set<String> values) {
 		this.values = values.toArray(new String[0]);
 	}
diff --git a/model/src/main/java/org/gluu/oxtrust/model/GluuSAMLTrustRelationship.java b/model/src/main/java/org/gluu/oxtrust/model/GluuSAMLTrustRelationship.java
index 99fc6df6a..b9493a005 100644
--- a/model/src/main/java/org/gluu/oxtrust/model/GluuSAMLTrustRelationship.java
+++ b/model/src/main/java/org/gluu/oxtrust/model/GluuSAMLTrustRelationship.java
@@ -6,6 +6,7 @@
 
 package org.gluu.oxtrust.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,6 +31,9 @@
 import org.gluu.site.ldap.persistence.annotation.LdapObjectClass;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.annotation.Nulls;
+import javax.xml.bind.annotation.XmlTransient;
 
 @LdapEntry
 @LdapObjectClass(values = { "top", "gluuSAMLconfig" })
@@ -164,14 +168,18 @@ public boolean equals(Object o) {
 	public List<String> getGluuEntityId() {
 		return gluuEntityId;
 	}
-
+        
+        @JsonIgnore
+        @XmlTransient
 	public void setGluuEntityId(Set<String> gluuEntityId) {
 		this.gluuEntityId = new ArrayList<String>(gluuEntityId);
 	}
+        
 	/*
-	 * This method is for ldap persistance only. For purposes of crud - please use setGluuEntityId(Set<String> gluuEntityId)
+	 * This method is for ldap persistance only. For purposes of crud - plea00se use setGluuEntityId(Set<String> gluuEntityId)
 	 */
 	@Deprecated
+        @JsonSetter(nulls = Nulls.AS_EMPTY)
 	public void setGluuEntityId(List<String> gluuEntityId) {
 		this.gluuEntityId = gluuEntityId;
 	}