diff --git a/src/module/actor/actor-data.ts b/src/module/actor/actor-data.ts
index 746ae439..4269bce0 100644
--- a/src/module/actor/actor-data.ts
+++ b/src/module/actor/actor-data.ts
@@ -25,8 +25,9 @@ interface UsableResource<T> {
     used: T;
 }
 
-interface CurrentData<T> extends ModifiableData<T> {
-    current: T;
+interface ResourceData<T> extends ModifiableData<T> {
+    value: T;
+    max?: T;
 }
 
 // Blueprint in case we need more detailed differentiation
@@ -42,7 +43,7 @@ interface DS4ActorDataTraits {
 }
 
 interface DS4ActorDataCombatValues {
-    hitPoints: CurrentData<number>;
+    hitPoints: ResourceData<number>;
     defense: ModifiableData<number>;
     initiative: ModifiableData<number>;
     movement: ModifiableData<number>;
diff --git a/src/module/actor/actor.ts b/src/module/actor/actor.ts
index c17d6843..7f2f8209 100644
--- a/src/module/actor/actor.ts
+++ b/src/module/actor/actor.ts
@@ -18,5 +18,7 @@ export class DS4Actor extends Actor<DS4ActorDataType, DS4ItemDataType, DS4Item>
         Object.values(combatValues).forEach(
             (combatValue: ModifiableData<number>) => (combatValue.total = combatValue.base + combatValue.mod),
         );
+
+        combatValues.hitPoints.max = combatValues.hitPoints.total;
     }
 }
diff --git a/src/system.json b/src/system.json
index a57664c3..a64a1a8c 100644
--- a/src/system.json
+++ b/src/system.json
@@ -20,7 +20,7 @@
     ],
     "gridDistance": 1,
     "gridUnits": "m",
-    "primaryTokenAttribute": "combatValues.hitPoints.current",
+    "primaryTokenAttribute": "combatValues.hitPoints",
     "url": "https://git.f3l.de/dungeonslayers/ds4",
     "manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/master/src/system.json?inline=false",
     "download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/0.1.0/download?job=build",
diff --git a/src/template.json b/src/template.json
index f4aef42d..fc61e8df 100644
--- a/src/template.json
+++ b/src/template.json
@@ -48,7 +48,7 @@
                 "hitPoints": {
                     "base": 0,
                     "mod": 0,
-                    "current": 0
+                    "value": 0
                 },
                 "defense": {
                     "base": 0,