diff --git a/resources/js/components/FormControls/Input.vue b/resources/js/components/FormControls/Input.vue
index 88e278b..d9c1527 100644
--- a/resources/js/components/FormControls/Input.vue
+++ b/resources/js/components/FormControls/Input.vue
@@ -27,7 +27,7 @@
                class="fpl-input flex-grow text-gray-700"
                :class="(valid.$invalid) ? 'ring-2 ring-offset-2 ring-opacity-30 ring-red-500' :''">
         <input v-else v-on:keyup.enter="$emit('keyUpEnter')" :disabled="control.disabled"
-               type="text"
+               :type="type"
                v-model="localValue"
                :placeholder="control.placeholder"
                class="fpl-input flex-grow text-gray-700"
@@ -66,6 +66,10 @@ export default {
     control: {},
     valid: {},
     value: {},
+    type: {
+      type: String,
+      default: 'text',
+    },
     showDescription: {
       type: Boolean,
       default: true,
@@ -84,10 +88,21 @@ export default {
   },
 
   watch: {
-    value (val) {
+    value (val, oldVal) {
+      if (val === oldVal) {
+        return
+      }
       this.localValue = val
     },
+
     localValue (val) {
+
+      if (val.length === 0) {
+        val = null
+      } else if (this.type === 'number') {
+        val = Number(val)
+      }
+
       this.$emit('valueUpdated', val)
       this.$emit('input', val)
     },
@@ -128,7 +143,7 @@ export default {
 
       if (this.localValue === null || this.localValue.length === 0) {
         this.localValue = null
-        return;
+        return
       }
 
       if (!this.device) {
diff --git a/resources/js/components/SchemaEditor/MetricEditPanel.vue b/resources/js/components/SchemaEditor/MetricEditPanel.vue
index c9cd537..4139959 100644
--- a/resources/js/components/SchemaEditor/MetricEditPanel.vue
+++ b/resources/js/components/SchemaEditor/MetricEditPanel.vue
@@ -55,7 +55,18 @@
           <Input :showDescription="false"
                  :control="{name: 'Engineering Unit',}"
                  :valid="{}"
-                 v-model="localMetric.Eng_Unit.default"
+                 :value="localMetric.Eng_Unit?.default" @input="(val) => {
+                   if (val === null) {
+                     if (localMetric.Eng_Unit) {
+                       delete localMetric.Eng_Unit
+                     }
+                     return;
+                   }
+                   if (!localMetric.Eng_Unit) {
+                      localMetric.Eng_Unit = {};
+                   }
+                   localMetric.Eng_Unit.default = val;
+                 }"
           ></Input>
         </div>
       </template>
@@ -66,8 +77,20 @@
         <div class="p-4 w-full">
           <Input :showDescription="false"
                  :control="{name: 'Low',}"
+                 type="number"
                  :valid="{}"
-                 :value="localMetric.Eng_Low.default" @input="(val) => {localMetric.Eng_Low.default = Number(val)}"
+                 :value="localMetric.Eng_Low?.default" @input="(val) => {
+                   if (val === null) {
+                     if (localMetric.Eng_Low) {
+                       delete localMetric.Eng_Low
+                     }
+                     return;
+                   }
+                   if (!localMetric.Eng_Low) {
+                      localMetric.Eng_Low = {};
+                   }
+                   localMetric.Eng_Low.default = val;
+                 }"
           ></Input>
         </div>
       </template>
@@ -79,7 +102,19 @@
           <Input :showDescription="false"
                  :control="{name: 'High',}"
                  :valid="{}"
-                 :value="localMetric.Eng_High.default" @input="(val) => {localMetric.Eng_High.default = Number(val)}"
+                 type="number"
+                 :value="localMetric.Eng_High?.default" @input="(val) => {
+                   if (val === null) {
+                     if (localMetric.Eng_High) {
+                       delete localMetric.Eng_High
+                     }
+                     return;
+                   }
+                   if (!localMetric.Eng_High) {
+                      localMetric.Eng_High = {};
+                   }
+                   localMetric.Eng_High.default = val;
+                 }"
           ></Input>
         </div>
       </template>
@@ -197,15 +232,6 @@ export default {
           Sparkplug_Type: {
             default: ['String'],
           },
-          Eng_Unit: {
-            default: '',
-          },
-          Eng_Low: {
-            default: '',
-          },
-          Eng_High: {
-            default: '',
-          },
         },
         ..._.cloneDeep(this.selectedMetric.property.allOf[1].properties),
       }
@@ -219,6 +245,7 @@ export default {
       localMetric: null,
       metricSchema: null,
       types: null,
+      console: console,
     }
   },
 }