diff --git a/src/schema/jsonSchema.json b/src/schema/jsonSchema.json
index 8609f49..e6515aa 100644
--- a/src/schema/jsonSchema.json
+++ b/src/schema/jsonSchema.json
@@ -1,443 +1,487 @@
 {
   "type": "object",
   "properties": {
-    "version": {
-      "type": "string"
+    "environment": {
+      "type": "string",
+      "enum": ["qa","dev","prod","automation"]
     },
-    "deployment": {
+    "data": {
       "type": "object",
       "properties": {
-        "cluster": {
-          "type": "string",
-          "enum": [
-            "nonprod.np.navi-tech.in",
-            "spike.np.navi-tech.in",
-            "prod.cmd.navi-tech.in",
-            "aps1.prod.navi-tech.in"
-          ]
-        },
-        "name": {
+        "version": {
           "type": "string"
         },
-        "timeout": {
-          "type": "number",
-          "minimum": 0
-        },
-        "instance": {
+        "deployment": {
           "type": "object",
-          "description": "Setup to maintain instances for a service",
           "properties": {
-            "count": {
-              "type": "integer",
-              "minimum": 1,
-              "description": "Age in years which must be equal to or greater than zero."
+            "cluster": {
+              "type": "string",
+              "enum": [
+                "nonprod.np.navi-tech.in",
+                "spike.np.navi-tech.in",
+                "prod.cmd.navi-tech.in",
+                "aps1.prod.navi-tech.in"
+              ]
             },
-            "cpu": {
+            "name": {
+              "type": "string"
+            },
+            "timeout": {
               "type": "number",
               "minimum": 0
             },
-            "memory": {
-              "type": "number"
-            }
-          }
-        },
-        "environmentVariables": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "description": "A setup variable for the container",
-            "properties": {
-              "name" : {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            }
-          },
-          "minItems": 1,
-          "uniqueItems": true
-        },
-        "exposedPorts": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "description": "List of ports exposed by service",
-            "properties": {
-              "name" : {
-                "type": "string",
-                "enum": ["metrics","serviceport"]
-              },
-              "port": {
-                "type": "number"
-              }
-            }
-          },
-          "minItems": 1
-        },
-        "loadBalancer": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "type": {
-                "type": "string",
-                "enum": [
-                  "elb",
-                  "alb",
-                  "sharedAlb",
-                  "kubeLb",
-                  "none"
-                ]
-              },
-              "accessPolicies": {
-                "type": "array",
-                "items": {
-                  "type": "string",
-                  "enum": [
-                    "internetFacing",
-                    "internal",
-                    "officeIp"
-                  ]
-                },
-                "uniqueItems": true,
-                "minItems": 1,
-                "maxItems": 2
-              },
-              "endpoint": {
-                "type": "string"
-              }
-            }
-          },
-          "minItems": 1
-        },
-        "namespace": {
-          "type": "string",
-          "enum": [
-            "dev",
-            "prod"
-          ]
-        },
-        "healthCheck": {
-          "type": "object",
-          "properties": {
-            "livenessCheck": {
+            "instance": {
               "type": "object",
+              "description": "Setup to maintain instances for a service",
               "properties": {
-                "type": {
-                  "type": "string",
-                  "enum": [
-                    "tcp",
-                    "http"
-                  ]
+                "count": {
+                  "type": "integer",
+                  "minimum": 1,
+                  "description": "Age in years which must be equal to or greater than zero."
                 },
-                "port": {
-                  "type": "string",
-                  "enum": [
-                    "metrics",
-                    "serviceport"
-                  ]
+                "cpu": {
+                  "type": "number",
+                  "minimum": 0
                 },
-                "successThreshold": {
-                  "type": "integer"
-                },
-                "initialDelaySeconds": {
-                  "type": "integer"
-                },
-                "periodSeconds": {
-                  "type": "integer"
-                },
-                "failureThreshold": {
-                  "type": "integer"
+                "memory": {
+                  "type": "number"
                 }
               }
             },
-            "readinessCheck": {
+            "environmentVariables": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "description": "A setup variable for the container",
+                "properties": {
+                  "name": {
+                    "type": "string"
+                  },
+                  "value": {
+                    "type": "string"
+                  }
+                }
+              },
+              "minItems": 1,
+              "uniqueItems": true
+            },
+            "exposedPorts": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "description": "List of ports exposed by service",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "enum": [
+                      "metrics",
+                      "serviceport"
+                    ]
+                  },
+                  "port": {
+                    "type": "number"
+                  }
+                }
+              },
+              "minItems": 1
+            },
+            "loadBalancer": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "type": "string",
+                    "enum": [
+                      "elb",
+                      "alb",
+                      "sharedAlb",
+                      "kubeLb",
+                      "none"
+                    ]
+                  },
+                  "accessPolicies": {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "enum": [
+                        "internetFacing",
+                        "internal",
+                        "officeIp"
+                      ]
+                    },
+                    "uniqueItems": true,
+                    "minItems": 1,
+                    "maxItems": 2
+                  },
+                  "endpoint": {
+                    "type": "string"
+                  }
+                }
+              },
+              "minItems": 1
+            },
+            "namespace": {
+              "type": "string",
+              "enum": [
+                "dev",
+                "prod"
+              ]
+            },
+            "healthCheck": {
               "type": "object",
               "properties": {
-                "type": {
+                "livenessCheck": {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "tcp",
+                        "http"
+                      ]
+                    },
+                    "port": {
+                      "type": "string",
+                      "enum": [
+                        "metrics",
+                        "serviceport"
+                      ]
+                    },
+                    "successThreshold": {
+                      "type": "integer"
+                    },
+                    "initialDelaySeconds": {
+                      "type": "integer"
+                    },
+                    "periodSeconds": {
+                      "type": "integer"
+                    },
+                    "failureThreshold": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "readinessCheck": {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string",
+                      "enum": [
+                        "tcp",
+                        "http"
+                      ]
+                    },
+                    "port": {
+                      "type": "string",
+                      "enum": [
+                        "metrics",
+                        "serviceport"
+                      ]
+                    },
+                    "successThreshold": {
+                      "type": "integer"
+                    },
+                    "initialDelaySeconds": {
+                      "type": "integer"
+                    },
+                    "periodSeconds": {
+                      "type": "integer"
+                    },
+                    "failureThreshold": {
+                      "type": "integer"
+                    },
+                    "path": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "team": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string",
+              "enum": [
+                "Accounting",
+                "Loan Management"
+              ]
+            }
+          }
+        },
+        "labels": {
+          "type": "object",
+          "description": "Represents labeling",
+          "properties": {
+            "micrometer-prometheus": {
+              "type": "string",
+              "enum": [
+                "enabled",
+                "disabled"
+              ]
+            }
+          }
+        },
+        "alerts": {
+          "type": "object",
+          "description": "Alerts",
+          "properties": {
+            "http4xx": {
+              "type": "object",
+              "properties": {
+                "thresholdPercent": {
+                  "type": "string"
+                },
+                "duration": {
+                  "type": "string"
+                },
+                "severity": {
                   "type": "string",
                   "enum": [
-                    "tcp",
-                    "http"
+                    "critical",
+                    "warning"
                   ]
+                }
+              }
+            },
+            "http5xx": {
+              "type": "object",
+              "properties": {
+                "thresholdPercent": {
+                  "type": "string"
                 },
-                "port": {
+                "duration": {
+                  "type": "string"
+                },
+                "severity": {
                   "type": "string",
                   "enum": [
-                    "metrics",
-                    "serviceport"
+                    "critical",
+                    "warning"
+                  ]
+                }
+              }
+            },
+            "elb4xx": {
+              "type": "object",
+              "properties": {
+                "thresholdPercent": {
+                  "type": "string"
+                },
+                "duration": {
+                  "type": "string"
+                },
+                "severity": {
+                  "type": "string",
+                  "enum": [
+                    "critical",
+                    "warning"
+                  ]
+                }
+              }
+            },
+            "elb5xx": {
+              "type": "object",
+              "properties": {
+                "thresholdPercent": {
+                  "type": "string"
+                },
+                "duration": {
+                  "type": "string"
+                },
+                "severity": {
+                  "type": "string",
+                  "enum": [
+                    "critical",
+                    "warning"
+                  ]
+                }
+              }
+            },
+            "latency": {
+              "type": "object",
+              "properties": {
+                "thresholdPercent": {
+                  "type": "string"
+                },
+                "duration": {
+                  "type": "string"
+                },
+                "severity": {
+                  "type": "string",
+                  "enum": [
+                    "critical",
+                    "warning"
+                  ]
+                }
+              }
+            },
+            "kafkaConsumerGroupLag": {
+              "type": "object",
+              "properties": {
+                "threshold": {
+                  "type": "string"
+                },
+                "duration": {
+                  "type": "string"
+                },
+                "severity": {
+                  "type": "string",
+                  "enum": [
+                    "critical",
+                    "warning"
                   ]
                 },
-                "successThreshold": {
-                  "type": "integer"
+                "group": {
+                  "type": "string",
+                  "enum": [
+                    "accounting",
+                    "loan management"
+                  ]
                 },
-                "initialDelaySeconds": {
-                  "type": "integer"
-                },
-                "periodSeconds": {
-                  "type": "integer"
-                },
-                "failureThreshold": {
-                  "type": "integer"
-                },
-                "path": {
+                "topic": {
                   "type": "string"
                 }
               }
             }
           }
-        }
-      }
-    },
-    "team": {
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string",
-          "enum": [
-            "Accounting",
-            "Loan Management"
-          ]
-        }
-      }
-    },
-    "labels": {
-      "type": "object",
-      "description": "Represents labeling",
-      "properties": {
-        "micrometer-prometheus": {
-          "type": "string",
-          "enum": [
-            "enabled",
-            "disabled"
-          ]
-        }
-      }
-    },
-    "alerts": {
-      "type": "object",
-      "description": "Alerts",
-      "properties": {
-        "http4xx": {
-          "type": "object",
-          "properties": {
-            "thresholdPercent": {
-              "type": "string"
-            },
-            "duration": {
-              "type": "string"
-            },
-            "severity": {
-              "type": "string",
-              "enum": ["critical","warning"]
-            }
-          }
         },
-        "http5xx": {
+        "extraResources": {
           "type": "object",
           "properties": {
-            "thresholdPercent": {
-              "type": "string"
-            },
-            "duration": {
-              "type": "string"
-            },
-            "severity": {
+            "environment": {
               "type": "string",
-              "enum": ["critical","warning"]
-            }
-          }
-        },
-        "elb4xx": {
-          "type": "object",
-          "properties": {
-            "thresholdPercent": {
-              "type": "string"
+              "enum": [
+                "spike"
+              ]
             },
-            "duration": {
-              "type": "string"
+            "database": {
+              "type": "object",
+              "properties": {
+                "instanceName": {
+                  "type": "string"
+                },
+                "user": {
+                  "type": "string"
+                },
+                "password": {
+                  "type": "string"
+                },
+                "sizeInGb": {
+                  "type": "string"
+                },
+                "dbNames": {
+                  "type": "array",
+                  "enum": [
+                    [
+                      "foo_service"
+                    ]
+                  ]
+                }
+              }
             },
-            "severity": {
-              "type": "string",
-              "enum": ["critical","warning"]
-            }
-          }
-        },
-        "elb5xx": {
-          "type": "object",
-          "properties": {
-            "thresholdPercent": {
-              "type": "string"
-            },
-            "duration": {
-              "type": "string"
-            },
-            "severity": {
-              "type": "string",
-              "enum": ["critical","warning"]
-            }
-          }
-        },
-        "latency": {
-          "type": "object",
-          "properties": {
-            "thresholdPercent": {
-              "type": "string"
-            },
-            "duration": {
-              "type": "string"
-            },
-            "severity": {
-              "type": "string",
-              "enum": ["critical","warning"]
-            }
-          }
-        },
-        "kafkaConsumerGroupLag": {
-          "type": "object",
-          "properties": {
-            "threshold": {
-              "type": "string"
-            },
-            "duration": {
-              "type": "string"
-            },
-            "severity": {
-              "type": "string",
-              "enum": ["critical","warning"]
-            },
-            "group": {
-              "type": "string",
-              "enum": ["accounting","loan management"]
-            },
-            "topic": {
-              "type": "string"
-            }
-          }
-        }
-      }
-    },
-    "extraResources": {
-      "type": "object",
-      "properties": {
-        "environment": {
-          "type": "string",
-          "enum": ["spike"]
-        },
-        "database": {
-          "type": "object",
-          "properties": {
-            "instanceName": {
-              "type": "string"
-            },
-            "user": {
-              "type": "string"
-            },
-            "password": {
-              "type": "string"
-            },
-            "sizeInGb": {
-              "type": "string"
-            },
-            "dbNames": {
+            "s3_buckets": {
               "type": "array",
-              "enum": [["foo_service"]]
-            }
-          }
-        },
-        "s3_buckets": {
-          "type": "array",
-          "title": "S3 Buckets",
-          "items": {
-            "type": "object",
-            "properties": {
-              "anonymizedBucketName": {
-                "type": "string"
-              },
-              "bucketTag": {
-                "type": "string"
-              },
-              "lifecycleRules": {
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "expiration": {
+              "title": "S3 Buckets",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "anonymizedBucketName": {
+                    "type": "string"
+                  },
+                  "bucketTag": {
+                    "type": "string"
+                  },
+                  "lifecycleRules": {
+                    "type": "array",
+                    "items": {
                       "type": "object",
                       "properties": {
-                        "days": {
-                          "type": "string"
+                        "expiration": {
+                          "type": "object",
+                          "properties": {
+                            "days": {
+                              "type": "string"
+                            }
+                          }
                         }
                       }
                     }
                   }
                 }
               }
+            },
+            "aws_access": {
+              "type": "object",
+              "properties": {
+                "policies": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "actions": {
+                        "type": "string",
+                        "enum": [
+                          "s3:GetObject",
+                          "s3:PutObject",
+                          "sns:Publish",
+                          "sns:SetSMSAttributes"
+                        ]
+                      },
+                      "resources": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "aws_access": {
+        "hpa": {
           "type": "object",
           "properties": {
-            "policies": {
+            "custom_metrics": {
               "type": "array",
               "items": {
                 "type": "object",
                 "properties": {
-                  "actions": {
-                    "type": "string",
-                    "enum": ["s3:GetObject","s3:PutObject","sns:Publish", "sns:SetSMSAttributes"]
+                  "name": {
+                    "type": "string"
                   },
-                  "resources": {
+                  "threshold": {
+                    "type": "number"
+                  },
+                  "query": {
                     "type": "string"
                   }
                 }
               }
-            }
-          }
-        }
-      }
-    },
-    "hpa": {
-      "type": "object",
-      "properties": {
-        "custom_metrics": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "name": {
-                "type": "string"
-              },
-              "threshold": {
-                "type": "number"
-              },
-              "query": {
-                "type": "string"
+            },
+            "maxReplicas": {
+              "type": "number"
+            },
+            "metrics": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string"
+                  },
+                  "threshold": {
+                    "type": "number"
+                  }
+                }
               }
+            },
+            "minReplicas": {
+              "type": "string"
             }
           }
-        },
-        "maxReplicas": {
-          "type": "number"
-        },
-        "metrics": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "name": {
-                "type": "string"
-              },
-              "threshold": {
-                "type": "number"
-              }
-            }
-          }
-        },
-        "minReplicas": {
-          "type": "string"
         }
       }
     }
diff --git a/src/schema/uiSchema.json b/src/schema/uiSchema.json
index 143af2f..26566cb 100644
--- a/src/schema/uiSchema.json
+++ b/src/schema/uiSchema.json
@@ -7,15 +7,19 @@
       "elements": [
         {
           "type": "Control",
-          "scope": "#/properties/version"
+          "scope": "#/properties/environment"
         },
         {
           "type": "Control",
-          "scope": "#/properties/team/properties/name"
+          "scope": "#/properties/data/properties/version"
         },
         {
           "type": "Control",
-          "scope": "#/properties/labels/properties/micrometer-prometheus"
+          "scope": "#/properties/data/properties/team/properties/name"
+        },
+        {
+          "type": "Control",
+          "scope": "#/properties/data/properties/labels/properties/micrometer-prometheus"
         }
       ]
     },
@@ -25,15 +29,15 @@
       "elements": [
         {
           "type": "Control",
-          "scope": "#/properties/deployment/properties/cluster"
+          "scope": "#/properties/data/properties/deployment/properties/cluster"
         },
         {
           "type": "Control",
-          "scope": "#/properties/deployment/properties/name"
+          "scope": "#/properties/data/properties/deployment/properties/name"
         },
         {
           "type": "Control",
-          "scope": "#/properties/deployment/properties/timeout"
+          "scope": "#/properties/data/properties/deployment/properties/timeout"
         }
       ]
     },
@@ -46,7 +50,7 @@
           "label": {
             "show": false
           },
-          "scope": "#/properties/deployment/properties/exposedPorts"
+          "scope": "#/properties/data/properties/deployment/properties/exposedPorts"
         }
       ]
     },
@@ -55,7 +59,7 @@
       "elements": [
         {
           "type": "Control",
-          "scope": "#/properties/deployment/properties/loadBalancer"
+          "scope": "#/properties/data/properties/deployment/properties/loadBalancer"
         }
       ]
     },
@@ -65,7 +69,7 @@
       "elements": [
         {
           "type": "Control",
-          "scope": "#/properties/deployment/properties/environmentVariables"
+          "scope": "#/properties/data/properties/deployment/properties/environmentVariables"
         }
       ]
     },
@@ -83,32 +87,32 @@
                 {
                   "type": "Control",
                   "label": "Type",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/type"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/type"
                 },
                 {
                   "type": "Control",
                   "label": "Port",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/port"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/port"
                 },
                 {
                   "type": "Control",
                   "label": "Success Threshold",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/successThreshold"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/successThreshold"
                 },
                 {
                   "type": "Control",
                   "label": "Failure Threshold",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/failureThreshold"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/failureThreshold"
                 },
                 {
                   "type": "Control",
                   "label": "Initial Delay in Seconds",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/initialDelaySeconds"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/initialDelaySeconds"
                 },
                 {
                   "type": "Control",
                   "label": "Period in Seconds",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/periodSeconds"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/livenessCheck/properties/periodSeconds"
                 }
               ]
             },
@@ -119,37 +123,37 @@
                 {
                   "type": "Control",
                   "label": "Type",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/type"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/type"
                 },
                 {
                   "type": "Control",
                   "label": "Port",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/port"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/port"
                 },
                 {
                   "type": "Control",
                   "label": "Success Threshold",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/successThreshold"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/successThreshold"
                 },
                 {
                   "type": "Control",
                   "label": "Failure Threshold",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/failureThreshold"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/failureThreshold"
                 },
                 {
                   "type": "Control",
                   "label": "Initial Delay in Seconds",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/initialDelaySeconds"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/initialDelaySeconds"
                 },
                 {
                   "type": "Control",
                   "label": "Period in Seconds",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/periodSeconds"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/periodSeconds"
                 },
                 {
                   "type": "Control",
                   "label": "Path",
-                  "scope": "#/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/path"
+                  "scope": "#/properties/data/properties/deployment/properties/healthCheck/properties/readinessCheck/properties/path"
                 }
               ]
             }
@@ -168,17 +172,17 @@
             {
               "type": "Control",
               "label": "Threshold Percent",
-              "scope": "#/properties/alerts/properties/http4xx/properties/thresholdPercent"
+              "scope": "#/properties/data/properties/alerts/properties/http4xx/properties/thresholdPercent"
             },
             {
               "type": "Control",
               "label": "Duration",
-              "scope": "#/properties/alerts/properties/http4xx/properties/duration"
+              "scope": "#/properties/data/properties/alerts/properties/http4xx/properties/duration"
             },
             {
               "type": "Control",
               "label": "Severity",
-              "scope": "#/properties/alerts/properties/http4xx/properties/severity"
+              "scope": "#/properties/data/properties/alerts/properties/http4xx/properties/severity"
             }
           ]
         },
@@ -189,17 +193,17 @@
             {
               "type": "Control",
               "label": "Threshold Percent",
-              "scope": "#/properties/alerts/properties/http5xx/properties/thresholdPercent"
+              "scope": "#/properties/data/properties/alerts/properties/http5xx/properties/thresholdPercent"
             },
             {
               "type": "Control",
               "label": "Duration",
-              "scope": "#/properties/alerts/properties/http5xx/properties/duration"
+              "scope": "#/properties/data/properties/alerts/properties/http5xx/properties/duration"
             },
             {
               "type": "Control",
               "label": "Severity",
-              "scope": "#/properties/alerts/properties/http5xx/properties/severity"
+              "scope": "#/properties/data/properties/alerts/properties/http5xx/properties/severity"
             }
           ]
         },
@@ -210,17 +214,17 @@
             {
               "type": "Control",
               "label": "Threshold Percent",
-              "scope": "#/properties/alerts/properties/elb4xx/properties/thresholdPercent"
+              "scope": "#/properties/data/properties/alerts/properties/elb4xx/properties/thresholdPercent"
             },
             {
               "type": "Control",
               "label": "Duration",
-              "scope": "#/properties/alerts/properties/elb4xx/properties/duration"
+              "scope": "#/properties/data/properties/alerts/properties/elb4xx/properties/duration"
             },
             {
               "type": "Control",
               "label": "Severity",
-              "scope": "#/properties/alerts/properties/elb4xx/properties/severity"
+              "scope": "#/properties/data/properties/alerts/properties/elb4xx/properties/severity"
             }
           ]
         },
@@ -231,17 +235,17 @@
             {
               "type": "Control",
               "label": "Threshold Percent",
-              "scope": "#/properties/alerts/properties/elb5xx/properties/thresholdPercent"
+              "scope": "#/properties/data/properties/alerts/properties/elb5xx/properties/thresholdPercent"
             },
             {
               "type": "Control",
               "label": "Duration",
-              "scope": "#/properties/alerts/properties/elb5xx/properties/duration"
+              "scope": "#/properties/data/properties/alerts/properties/elb5xx/properties/duration"
             },
             {
               "type": "Control",
               "label": "Severity",
-              "scope": "#/properties/alerts/properties/elb5xx/properties/severity"
+              "scope": "#/properties/data/properties/alerts/properties/elb5xx/properties/severity"
             }
           ]
         },
@@ -252,17 +256,17 @@
             {
               "type": "Control",
               "label": "Threshold Percent",
-              "scope": "#/properties/alerts/properties/latency/properties/thresholdPercent"
+              "scope": "#/properties/data/properties/alerts/properties/latency/properties/thresholdPercent"
             },
             {
               "type": "Control",
               "label": "Duration",
-              "scope": "#/properties/alerts/properties/latency/properties/duration"
+              "scope": "#/properties/data/properties/alerts/properties/latency/properties/duration"
             },
             {
               "type": "Control",
               "label": "Severity",
-              "scope": "#/properties/alerts/properties/latency/properties/severity"
+              "scope": "#/properties/data/properties/alerts/properties/latency/properties/severity"
             }
           ]
         },
@@ -273,27 +277,27 @@
             {
               "type": "Control",
               "label": "Group",
-              "scope": "#/properties/alerts/properties/kafkaConsumerGroupLag/properties/group"
+              "scope": "#/properties/data/properties/alerts/properties/kafkaConsumerGroupLag/properties/group"
             },
             {
               "type": "Control",
               "label": "Duration",
-              "scope": "#/properties/alerts/properties/kafkaConsumerGroupLag/properties/duration"
+              "scope": "#/properties/data/properties/alerts/properties/kafkaConsumerGroupLag/properties/duration"
             },
             {
               "type": "Control",
               "label": "Severity",
-              "scope": "#/properties/alerts/properties/kafkaConsumerGroupLag/properties/severity"
+              "scope": "#/properties/data/properties/alerts/properties/kafkaConsumerGroupLag/properties/severity"
             },
             {
               "type": "Control",
               "label": "Topic",
-              "scope": "#/properties/alerts/properties/kafkaConsumerGroupLag/properties/topic"
+              "scope": "#/properties/data/properties/alerts/properties/kafkaConsumerGroupLag/properties/topic"
             },
             {
               "type": "Control",
               "label": "Threshold",
-              "scope": "#/properties/alerts/properties/kafkaConsumerGroupLag/properties/threshold"
+              "scope": "#/properties/data/properties/alerts/properties/kafkaConsumerGroupLag/properties/threshold"
             }
           ]
         }
@@ -307,7 +311,7 @@
             {
               "type": "Control",
               "label": "Environment",
-              "scope": "#/properties/extraResources/properties/environment"
+              "scope": "#/properties/data/properties/extraResources/properties/environment"
             },
             {
               "type": "Group",
@@ -316,27 +320,27 @@
                 {
                   "type": "Control",
                   "label": "Instance Name",
-                  "scope": "#/properties/extraResources/properties/database/properties/instanceName"
+                  "scope": "#/properties/data/properties/extraResources/properties/database/properties/instanceName"
                 },
                 {
                   "type": "Control",
                   "label": "User",
-                  "scope": "#/properties/extraResources/properties/database/properties/user"
+                  "scope": "#/properties/data/properties/extraResources/properties/database/properties/user"
                 },
                 {
                   "type": "Control",
                   "label": "Password",
-                  "scope": "#/properties/extraResources/properties/database/properties/password"
+                  "scope": "#/properties/data/properties/extraResources/properties/database/properties/password"
                 },
                 {
                   "type": "Control",
                   "label": "Memory Size(in Gb)",
-                  "scope": "#/properties/extraResources/properties/database/properties/sizeInGb"
+                  "scope": "#/properties/data/properties/extraResources/properties/database/properties/sizeInGb"
                 },
                 {
                   "type": "Control",
                   "label": "Name",
-                  "scope": "#/properties/extraResources/properties/database/properties/dbNames"
+                  "scope": "#/properties/data/properties/extraResources/properties/database/properties/dbNames"
                 }
               ]
             },
@@ -345,7 +349,7 @@
               "elements": [
                 {
                   "type": "Control",
-                  "scope": "#/properties/extraResources/properties/s3_buckets"
+                  "scope": "#/properties/data/properties/extraResources/properties/s3_buckets"
                 }
               ]
             },
@@ -354,7 +358,7 @@
               "elements": [
                 {
                   "type": "Control",
-                  "scope": "#/properties/extraResources/properties/aws_access/properties/policies"
+                  "scope": "#/properties/data/properties/extraResources/properties/aws_access/properties/policies"
                 }
               ]
             }
@@ -370,7 +374,7 @@
           "elements": [
             {
               "type": "Control",
-              "scope": "#/properties/hpa/properties/custom_metrics"
+              "scope": "#/properties/data/properties/hpa/properties/custom_metrics"
             }
           ]
         },
@@ -379,7 +383,7 @@
           "elements": [
             {
               "type": "Control",
-              "scope": "#/properties/hpa/properties/metrics"
+              "scope": "#/properties/data/properties/hpa/properties/metrics"
             }
           ]
         },
@@ -390,12 +394,12 @@
             {
               "type": "Control",
               "label": "Minimum Replicas",
-              "scope": "#/properties/hpa/properties/minReplicas"
+              "scope": "#/properties/data/properties/hpa/properties/minReplicas"
             },
             {
               "type": "Control",
               "label": "Maximum Replicas",
-              "scope": "#/properties/hpa/properties/maxReplicas"
+              "scope": "#/properties/data/properties/hpa/properties/maxReplicas"
             }
           ]
         }