diff --git a/src/main/java/org/openepics/names/rest/beans/element/NameElement.java b/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
index b8fe73479dc718d526e5556f69ba2d0fadfd52f1..d0c2846f15d60a7c2bdc516eb24170fcc8a53ba4 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
@@ -234,12 +234,7 @@ public class NameElement extends NameElementCommand implements Serializable {
 
     @Override
     public int hashCode() {
-        return Objects.hash(
-                getUuid(), getParentsystemstructure(), getParentdevicestructure(), getIndex(),
-                getDescription(), getComment(),
-                getSystemstructure(), getDevicestructure(),
-                getName(), getStatus(), isLatest(), isDeleted(),
-                getWhen(), getWho());
+        return Objects.hash(getUuid(), getWhen());
     }
 
     @Override
diff --git a/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
index 5f2dc7c18791d876a5ae65d00e0e97438943098a..5635749a0225a73cab5490f70ba6af2d8feb0b73 100644
--- a/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
@@ -223,11 +223,7 @@ public class StructureElement extends StructureElementCommand implements Seriali
 
     @Override
     public int hashCode() {
-        return Objects.hash(
-                getUuid(), getType(), getParent(),
-                getName(), getMnemonic(), getDescription(), getComment(),
-                getMnemonicpath(), getLevel(), getStatus(), isLatest(), isDeleted(),
-                getWhen(), getWho());
+        return Objects.hash(getUuid(), getWhen());
     }
 
     @Override