diff --git a/module/data/Item/Armour.mjs b/module/data/Item/Armour.mjs
index b12e969..0f3064f 100644
--- a/module/data/Item/Armour.mjs
+++ b/module/data/Item/Armour.mjs
@@ -48,6 +48,7 @@ export class ArmourData extends foundry.abstract.TypeDataModel {
 	getFormFields(ctx) {
 		const fields = [
 			{
+				id: `location`,
 				type: `string-set`,
 				label: `RipCrypt.common.location`,
 				placeholder: `RipCrypt.Apps.location-placeholder`,
@@ -55,6 +56,7 @@ export class ArmourData extends foundry.abstract.TypeDataModel {
 				value: this.locationString,
 			},
 			{
+				id: `protection`,
 				type: `integer`,
 				label: `RipCrypt.common.protection`,
 				value: this.protection,
diff --git a/module/data/Item/Weapon.mjs b/module/data/Item/Weapon.mjs
index 35a7f89..0c05b64 100644
--- a/module/data/Item/Weapon.mjs
+++ b/module/data/Item/Weapon.mjs
@@ -60,6 +60,7 @@ export class WeaponData extends foundry.abstract.TypeDataModel {
 	getFormFields(ctx) {
 		const fields = [
 			{
+				id: `traits`,
 				type: `string-set`,
 				label: `RipCrypt.common.traits`,
 				placeholder: `RipCrypt.Apps.traits-placeholder`,
@@ -67,6 +68,7 @@ export class WeaponData extends foundry.abstract.TypeDataModel {
 				value: this.traitString,
 			},
 			{
+				id: `short-range`,
 				type: `integer`,
 				label: `RipCrypt.Apps.short-range`,
 				path: `system.range.short`,
@@ -74,6 +76,7 @@ export class WeaponData extends foundry.abstract.TypeDataModel {
 				min: 0,
 			},
 			{
+				id: `long-range`,
 				type: `integer`,
 				label: `RipCrypt.Apps.long-range`,
 				path: `system.range.long`,
@@ -81,6 +84,7 @@ export class WeaponData extends foundry.abstract.TypeDataModel {
 				min: 0,
 			},
 			{
+				id: `damage`,
 				type: `integer`,
 				label: `RipCrypt.common.damage`,
 				path: `system.damage`,
@@ -104,6 +108,7 @@ export class WeaponData extends foundry.abstract.TypeDataModel {
 				},
 			},
 			{
+				id: `access`,
 				type: `dropdown`,
 				label: `Access`,
 				path: `system.access`,
@@ -123,7 +128,11 @@ export class WeaponData extends foundry.abstract.TypeDataModel {
 		];
 
 		if (this.parent.isEmbedded) {
-			fields.push({ type: `boolean`, label: `Equipped` });
+			fields.push({
+				id: `equipped`,
+				type: `boolean`,
+				label: `Equipped`,
+			});
 		};
 
 		return fields;
diff --git a/module/handlebarHelpers/inputs/booleanInput.mjs b/module/handlebarHelpers/inputs/booleanInput.mjs
index cda20a9..c3db3c3 100644
--- a/module/handlebarHelpers/inputs/booleanInput.mjs
+++ b/module/handlebarHelpers/inputs/booleanInput.mjs
@@ -1,10 +1,8 @@
 import { localizer } from "../../utils/Localizer.mjs";
 
-const { randomID } = foundry.utils;
-
 export function booleanInput(input, data) {
 	const label = localizer(input.label);
-	const id = `${data.meta.idp}-${randomID(10)}`;
+	const id = `${data.meta.idp}-${input.id}`;
 
 	if (data.meta.limited) {
 		return `<div data-input-type="boolean">
diff --git a/module/handlebarHelpers/inputs/dropdownInput.mjs b/module/handlebarHelpers/inputs/dropdownInput.mjs
index 142a9b1..9b19a6e 100644
--- a/module/handlebarHelpers/inputs/dropdownInput.mjs
+++ b/module/handlebarHelpers/inputs/dropdownInput.mjs
@@ -1,11 +1,9 @@
 import { localizer } from "../../utils/Localizer.mjs";
 import { options } from "../options.mjs";
 
-const { randomID } = foundry.utils;
-
 export function dropdownInput(input, data) {
 	const label = localizer(input.label);
-	const id = `${data.meta.idp}-${randomID(10)}`;
+	const id = `${data.meta.idp}-${input.id}`;
 
 	if (!data.meta.editable) {
 		return `<div data-input-type="dropdown">
diff --git a/module/handlebarHelpers/inputs/numberInput.mjs b/module/handlebarHelpers/inputs/numberInput.mjs
index 9da389b..e549b36 100644
--- a/module/handlebarHelpers/inputs/numberInput.mjs
+++ b/module/handlebarHelpers/inputs/numberInput.mjs
@@ -1,10 +1,8 @@
 import { localizer } from "../../utils/Localizer.mjs";
 
-const { randomID } = foundry.utils;
-
 export function numberInput(input, data) {
 	const label = localizer(input.label);
-	const id = `${data.meta.idp}-${randomID(10)}`;
+	const id = `${data.meta.idp}-${input.id}`;
 
 	if (!data.meta.editable) {
 		return `<div data-input-type="integer">
diff --git a/module/handlebarHelpers/inputs/stringSet.mjs b/module/handlebarHelpers/inputs/stringSet.mjs
index 086cd61..1f059ac 100644
--- a/module/handlebarHelpers/inputs/stringSet.mjs
+++ b/module/handlebarHelpers/inputs/stringSet.mjs
@@ -1,11 +1,9 @@
 import { localizer } from "../../utils/Localizer.mjs";
 
-const { randomID } = foundry.utils;
-
 export function stringSet(input, data) {
 	const label = localizer(input.label);
 	const placeholder = localizer(input.placeholder ?? ``);
-	const id = `${data.meta.idp}-${randomID(10)}`;
+	const id = `${data.meta.idp}-${input.id}`;
 
 	if (!data.meta.editable) {
 		const tagList = input.value