diff --git a/api/src/main/java/org/openmrs/BaseCustomizableData.java b/api/src/main/java/org/openmrs/BaseCustomizableData.java
index 732615c5f..b584f5d95 100644
--- a/api/src/main/java/org/openmrs/BaseCustomizableData.java
+++ b/api/src/main/java/org/openmrs/BaseCustomizableData.java
@@ -14,6 +14,7 @@ import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.openmrs.attribute.Attribute;
 import org.openmrs.customdatatype.CustomValueDescriptor;
@@ -26,7 +27,7 @@ import org.openmrs.customdatatype.Customizable;
  */
 public abstract class BaseCustomizableData<A extends Attribute> extends BaseChangeableOpenmrsData implements Customizable<A> {
 	
-	private Set<A> attributes = new LinkedHashSet<>();
+	private Set<A> attributes = new TreeSet<>();
 	
 	/**
 	 * @see org.openmrs.customdatatype.Customizable#getAttributes()
diff --git a/api/src/main/java/org/openmrs/Person.java b/api/src/main/java/org/openmrs/Person.java
index 948e3480f..1024f69d8 100644
--- a/api/src/main/java/org/openmrs/Person.java
+++ b/api/src/main/java/org/openmrs/Person.java
@@ -53,11 +53,6 @@ public class Person extends BaseCustomizableData<PersonAttribute> {
 	@ContainedIn
 	private Set<PersonName> names = null;
 	
-	@Override
-	public Set<PersonAttribute> getAttributes() {
-		return super.getAttributes();
-	}
-	
 	@Field
 	private String gender;
 	
@@ -395,18 +390,11 @@ public class Person extends BaseCustomizableData<PersonAttribute> {
 	public void setNames(Set<PersonName> names) {
 		this.names = names;
 	}
-	
-	/**
-	 * @return all known attributes for person
-	 * @see org.openmrs.PersonAttribute
-	 * <strong>Should</strong> not get voided attributes
-	 * <strong>Should</strong> not fail with null attributes
-	 */
+
+	@ContainedIn
+	@Override
 	public Set<PersonAttribute> getAttributes() {
-		if (attributes == null) {
-			attributes = new TreeSet<>();
-		}
-		return this.attributes;
+		return super.getAttributes();
 	}
 	
 	/**
@@ -414,7 +402,7 @@ public class Person extends BaseCustomizableData<PersonAttribute> {
 	 * @see org.openmrs.PersonAttribute
 	 */
 	public void setAttributes(Set<PersonAttribute> attributes) {
-		this.attributes = attributes;
+		super.setAttributes(attributes);
 		attributeMap = null;
 		allAttributeMap = null;
 	}
@@ -465,8 +453,10 @@ public class Person extends BaseCustomizableData<PersonAttribute> {
 				}
 			}
 		}
+		
 		attributeMap = null;
 		allAttributeMap = null;
+		Set<PersonAttribute> attributes = getAttributes();
 		if (!OpenmrsUtil.collectionContains(attributes, newAttribute) && !newIsNull) {
 			attributes.add(newAttribute);
 		}
@@ -482,6 +472,7 @@ public class Person extends BaseCustomizableData<PersonAttribute> {
 	 * <strong>Should</strong> remove attribute when exist
 	 */
 	public void removeAttribute(PersonAttribute attribute) {
+		Set<PersonAttribute> attributes = getAttributes();
 		if (attributes != null && attributes.remove(attribute)) {
 			attributeMap = null;
 			allAttributeMap = null;
diff --git a/api/src/main/java/org/openmrs/VisitAttribute.java b/api/src/main/java/org/openmrs/VisitAttribute.java
index cd75bd2b7..3602f07c3 100644
--- a/api/src/main/java/org/openmrs/VisitAttribute.java
+++ b/api/src/main/java/org/openmrs/VisitAttribute.java
@@ -17,7 +17,7 @@ import org.openmrs.attribute.BaseAttribute;
  * @see Attribute
  * @since 1.9
  */
-public class VisitAttribute extends BaseAttribute<VisitAttributeType, Visit> implements Attribute<VisitAttributeType, Visit> {
+public class VisitAttribute extends BaseAttribute<VisitAttributeType, Visit> {
 	
 	private Integer visitAttributeId;
 	
diff --git a/api/src/main/java/org/openmrs/attribute/Attribute.java b/api/src/main/java/org/openmrs/attribute/Attribute.java
index 472797444..edc106ab8 100644
--- a/api/src/main/java/org/openmrs/attribute/Attribute.java
+++ b/api/src/main/java/org/openmrs/attribute/Attribute.java
@@ -27,7 +27,7 @@ import org.openmrs.customdatatype.SingleCustomValue;
  * @see Customizable
  * @since 1.9
  */
-public interface Attribute<AT extends AttributeType, OT extends Customizable<?>> extends OpenmrsData, SingleCustomValue<AT> {
+public interface Attribute<AT extends AttributeType, OT extends Customizable<?>> extends OpenmrsData, SingleCustomValue<AT>, Comparable<Attribute> {
 	
 	/**
 	 * @return the owner that this attribute belongs to