diff --git a/ui/public/assets/schema/attribute/attribute.schema.json b/ui/public/assets/schema/attribute/attribute.schema.json
index b821ed7bb..97bf5c4f0 100644
--- a/ui/public/assets/schema/attribute/attribute.schema.json
+++ b/ui/public/assets/schema/attribute/attribute.schema.json
@@ -22,12 +22,20 @@
             "enum": [
                 "STRING",
                 "BOOLEAN",
-                "SELECTION_LIST"
+                "SELECTION_LIST",
+                "LONG",
+                "DOUBLE",
+                "DURATION",
+                "SPRING_BEAN_ID"
             ],
             "enumNames": [
                 "value.string",
                 "value.boolean",
-                "value.list"
+                "value.list",
+                "value.long",
+                "value.double",
+                "value.duration",
+                "value.spring-bean-id"
             ]
         },
         "attributeFriendlyName": {
@@ -44,6 +52,30 @@
             "minLength": 1,
             "maxLength": 255
         },
+        "persistFriendlyName": {
+            "type": "string",
+            "title": "label.entity-attribute-friendly-name",
+            "description": "tooltip.entity-attribute-friendly-name",
+            "minLength": 1,
+            "maxLength": 255
+        },
+        "persistType": {
+            "type": "string",
+            "title": "label.entity-attribute-attr-name",
+            "description": "tooltip.entity-attribute-attr-name",
+            "minLength": 1,
+            "maxLength": 255,
+            "enum": [
+                "boolean",
+                "string",
+                "number"
+            ],
+            "enumNames": [
+                "boolean",
+                "string",
+                "number"
+            ]
+        },
         "displayName": {
             "type": "string",
             "title": "label.entity-attribute-display-name",
@@ -69,7 +101,7 @@
                                 "STRING"
                             ]
                         },
-                        "defaultValueString": {
+                        "defaultValue": {
                             "title": "label.entity-attribute-default",
                             "description": "tooltip.entity-attribute-default",
                             "type": "string"
@@ -83,12 +115,73 @@
                                 "BOOLEAN"
                             ]
                         },
-                        "defaultValueBoolean": {
+                        "defaultValue": {
+                            "title": "label.entity-attribute-default",
+                            "description": "tooltip.entity-attribute-default",
+                            "type": "string",
+                            "default": "true",
+                            "enumNames": [
+                                "True",
+                                "False"
+                            ]
+                        }
+                    }
+                },
+                {
+                    "properties": {
+                        "attributeType": {
+                            "enum": [
+                                "DURATION"
+                            ]
+                        },
+                        "defaultValue": {
+                            "title": "label.entity-attribute-default",
+                            "description": "tooltip.entity-attribute-default",
+                            "type": "string",
+                            "pattern": "^(R\\d*\\/)?P(?:\\d+(?:\\.\\d+)?Y)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?W)?(?:\\d+(?:\\.\\d+)?D)?(?:T(?:\\d+(?:\\.\\d+)?H)?(?:\\d+(?:\\.\\d+)?M)?(?:\\d+(?:\\.\\d+)?S)?)?$"
+                        }
+                    }
+                },
+                {
+                    "properties": {
+                        "attributeType": {
+                            "enum": [
+                                "LONG"
+                            ]
+                        },
+                        "defaultValue": {
+                            "title": "label.entity-attribute-default",
+                            "description": "tooltip.entity-attribute-default",
+                            "type": "string"
+                        }
+                    }
+                },
+                {
+                    "properties": {
+                        "attributeType": {
+                            "enum": [
+                                "DOUBLE"
+                            ]
+                        },
+                        "defaultValue": {
+                            "title": "label.entity-attribute-default",
+                            "description": "tooltip.entity-attribute-default",
+                            "type": "string"
+                        }
+                    }
+                },
+                {
+                    "properties": {
+                        "attributeType": {
+                            "enum": [
+                                "INTEGER"
+                            ]
+                        },
+                        "defaultValue": {
                             "title": "label.entity-attribute-default",
                             "description": "tooltip.entity-attribute-default",
-                            "type": "boolean",
-                            "default": true,
-                            "enumNames": ["True", "False"]
+                            "type": "string",
+                            "pattern": "^\\d+$"
                         }
                     }
                 },
diff --git a/ui/src/app/App.js b/ui/src/app/App.js
index 097c0095d..5d0c4e1e4 100644
--- a/ui/src/app/App.js
+++ b/ui/src/app/App.js
@@ -34,6 +34,7 @@ function App() {
     const [showTimeout] = React.useState();
 
     const httpOptions = {
+        cachePolicy: 'no-cache',
         redirect: 'manual',
         interceptors: {
             request: async ({options, url, path, route}) => {