diff --git a/jastadd-mquat-base/src/main/jastadd/solution/Helpers.jadd b/jastadd-mquat-base/src/main/jastadd/solution/DeepCopy.jadd
similarity index 75%
rename from jastadd-mquat-base/src/main/jastadd/solution/Helpers.jadd
rename to jastadd-mquat-base/src/main/jastadd/solution/DeepCopy.jadd
index 1de968043594d29515cc9314e1cc43eb2456aa64..a5f2a60bbc1621100f9fee3420022f7ff54ab3e3 100644
--- a/jastadd-mquat-base/src/main/jastadd/solution/Helpers.jadd
+++ b/jastadd-mquat-base/src/main/jastadd/solution/DeepCopy.jadd
@@ -1,4 +1,7 @@
-aspect Helpers {
+aspect DeepCopy {
+
+  // TODO this aspect is probably not required, since there is treeCopy(). But since treeCopy() does not consider
+  // intrinsic references, it might be wise to keep it for now.
 
   /**
    * @return a deep copy of the assignment
@@ -34,10 +37,19 @@ aspect Helpers {
     return copy;
   }
 
+  /**
+   * @return a deep copy of a resource class
+   */
   public ResourceClassMapping ResourceClassMapping.deepCopy() {
     ResourceClassMapping copy = new ResourceClassMapping();
     copy.setInstance(this.getInstance());
     copy.setResourceClass(this.getResourceClass());
+    for (ResourceClassMapping subMapping : getResourceClassMappingList()) {
+      copy.addResourceClassMapping(subMapping.deepCopy());
+    }
+    for (ResourceRef resourceRef : getResourceRefList()) {
+      copy.addResourceRef(resourceRef.getRef().createRef());
+    }
     return copy;
   }