diff --git a/module/data/item/subclass.mjs b/module/data/item/subclass.mjs
index 8fbacee8..883df064 100644
--- a/module/data/item/subclass.mjs
+++ b/module/data/item/subclass.mjs
@@ -1,3 +1,4 @@
+import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import BaseDataItem from './base.mjs';
 
 export default class DHSubclass extends BaseDataItem {
@@ -21,40 +22,9 @@ export default class DHSubclass extends BaseDataItem {
                 nullable: true,
                 initial: null
             }),
-            foundationFeature: new fields.SchemaField({
-                description: new fields.HTMLField({}),
-                abilities: new fields.ArrayField(
-                    new fields.SchemaField({
-                        name: new fields.StringField({}),
-                        img: new fields.StringField({}),
-                        uuid: new fields.StringField({})
-                    })
-                )
-            }),
-            specializationFeature: new fields.SchemaField({
-                unlocked: new fields.BooleanField({ initial: false }),
-                tier: new fields.NumberField({ initial: null, nullable: true, integer: true }),
-                description: new fields.HTMLField({}),
-                abilities: new fields.ArrayField(
-                    new fields.SchemaField({
-                        name: new fields.StringField({}),
-                        img: new fields.StringField({}),
-                        uuid: new fields.StringField({})
-                    })
-                )
-            }),
-            masteryFeature: new fields.SchemaField({
-                unlocked: new fields.BooleanField({ initial: false }),
-                tier: new fields.NumberField({ initial: null, nullable: true, integer: true }),
-                description: new fields.HTMLField({}),
-                abilities: new fields.ArrayField(
-                    new fields.SchemaField({
-                        name: new fields.StringField({}),
-                        img: new fields.StringField({}),
-                        uuid: new fields.StringField({})
-                    })
-                )
-            }),
+            foundationFeature: new ForeignDocumentUUIDField({ type: 'Item' }),
+            specializationFeature: new ForeignDocumentUUIDField({ type: 'Item' }),
+            masteryFeature: new ForeignDocumentUUIDField({ type: 'Item' }),
             isMulticlass: new fields.BooleanField({ initial: false })
         };
     }
diff --git a/templates/sheets/items/subclass/features.hbs b/templates/sheets/items/subclass/features.hbs
index eb2010c4..d9ebb3c1 100644
--- a/templates/sheets/items/subclass/features.hbs
+++ b/templates/sheets/items/subclass/features.hbs
@@ -5,22 +5,16 @@
 >
     <fieldset>
         <legend>{{localize "DAGGERHEART.Sheets.Subclass.Tabs.Foundation"}}</legend>
-        {{#each source.system.foundationFeature.abilities as |feature key|}}
-            {{> 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs' feature=feature}}
-        {{/each}}
+        {{> 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs' feature=source.system.foundationFeature}}
     </fieldset>
 
     <fieldset>
         <legend>{{localize "DAGGERHEART.Sheets.Subclass.Tabs.Specialization"}}</legend>
-        {{#each source.system.specializationFeature.abilities as |feature key|}}
-            {{> 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs' feature=feature}}
-        {{/each}}
+        {{> 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs' feature=source.system.specializationFeature}}
     </fieldset>
 
     <fieldset>
         <legend>{{localize "DAGGERHEART.Sheets.Subclass.Tabs.Mastery"}}</legend>
-        {{#each source.system.masteryFeature.abilities as |feature key|}}
-            {{> 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs' feature=feature}}
-        {{/each}}
+        {{> 'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs' feature=source.system.masteryFeature}}
     </fieldset>
 </section>
\ No newline at end of file