@pdtf/schemas 3.0.0-1 → 3.0.0-11

package/src/schemas/v3/combined.json

@@ -183,7 +183,21 @@
             "environmentalIssues",
             "additionalInformation"
           ],
-          "ntsRequired": ["ownership", "councilTax", "energyEfficiency"],
+          "ntsRequired": [
+            "ownership",
+            "councilTax",
+            "energyEfficiency",
+            "buildInformation",
+            "typeOfConstruction",
+            "connectedUtilities",
+            "waterAndDrainage",
+            "heating",
+            "parking",
+            "listingAndConservation",
+            "rightsAndInformalArrangements",
+            "environmentalIssues",
+            "notices"
+          ],
           "properties": {
             "address": {
               "baspiRef": "A1.1",
@@ -251,140 +265,6 @@
               "title": "Unique Property Reference Number ",
               "type": "integer"
             },
-            "propertyType": {
-              "title": "Type of Property",
-              "description": "The type or category of the property.",
-              "type": "string",
-              "enum": [
-                "Not Specified",
-                "Terraced House",
-                "End of terrace house",
-                "Semi-detached house",
-                "Detached house",
-                "Mews house",
-                "Cluster house",
-                "Ground floor flat",
-                "Flat",
-                "Studio flat",
-                "Ground floor maisonette",
-                "Maisonette",
-                "Bungalow",
-                "Terraced bungalow",
-                "Semi-detached bungalow",
-                "Detached bungalow",
-                "Mobile home",
-                "Land (Residential)",
-                "Link detached house",
-                "Town house",
-                "Cottage",
-                "Chalet",
-                "Character Property",
-                "House (unspecified)",
-                "Villa",
-                "Apartment",
-                "Penthouse",
-                "Finca",
-                "Barn Conversion",
-                "Serviced apartment",
-                "Parking",
-                "Sheltered Housing",
-                "Reteirment property",
-                "House share",
-                "Flat share",
-                "Park home",
-                "Garages",
-                "Farm House",
-                "Equestrian facility",
-                "Duplex",
-                "Triplex",
-                "Longere",
-                "Gite",
-                "Barn",
-                "Trulli",
-                "Mill",
-                "Ruins",
-                "Restaurant",
-                "Cafe",
-                "Castle",
-                "Village House",
-                "Cave House",
-                "Cortijo",
-                "Farm Land",
-                "Plot",
-                "Country House",
-                "Stone House",
-                "Caravan",
-                "Lodge",
-                "Log Cabin",
-                "Manor House",
-                "Stately Home",
-                "Off-Plan",
-                "Semi-detached Villa",
-                "Detached Villa",
-                "Bar/Nightclub",
-                "Shop",
-                "Riad",
-                "House Boat",
-                "Hotel Room",
-                "Block of Apartments",
-                "Private Halls",
-                "Office",
-                "Business Park",
-                "Serviced Office",
-                "Retail Property (High Street)",
-                "Retail Property (Out of Town)",
-                "Convenience Store",
-                "Hairdresser/Barber Shop",
-                "Hotel",
-                "Petrol Station",
-                "Post Office",
-                "Pub",
-                "Workshop & Retail Space",
-                "Distribution Warehouse",
-                "Factory",
-                "Heavy Industrial",
-                "Industrial Park",
-                "Light Industrial",
-                "Storage",
-                "Showroom",
-                "Warehouse",
-                "Land (Commercial)",
-                "Commercial Development",
-                "Industrial Development",
-                "Residential Development",
-                "Commercial Property",
-                "Data Centre",
-                "Farm",
-                "Healthcare Facility",
-                "Marine Property",
-                "Mixed Use",
-                "Research & Development Facility",
-                "Science Park",
-                "Guest House",
-                "Hospitality",
-                "Leisure Facility",
-                "Takeaway",
-                "Childcare Facility",
-                "Smallholding",
-                "Place of Worship",
-                "Trade Counter",
-                "Coach House",
-                "House of Multiple Occupation",
-                "Sports facilities",
-                "Spa",
-                "Campsite & Holiday Village"
-              ]
-            },
-            "isNewBuild": {
-              "title": "Is the property a New Build?",
-              "type": "object",
-              "properties": {
-                "yesNo": {
-                  "type": "string",
-                  "enum": ["Yes", "No"]
-                }
-              }
-            },
             "location": {
               "title": "Geographical location",
               "type": "object",
@@ -559,9 +439,155 @@
               }
             },
             "buildInformation": {
-              "title": "Information related to property build",
+              "ntsRef": "B1.1",
+              "title": "About the property building",
               "type": "object",
+              "ntsRequired": ["building", "roomDimensions"],
               "properties": {
+                "building": {
+                  "ntsRef": "B1.1.1",
+                  "title": "Building informatiom",
+                  "type": "object",
+                  "ntsRequired": ["propertyType"],
+                  "properties": {
+                    "propertyType": {
+                      "ntsRef": "B1.1.1.1",
+                      "title": "Property type",
+                      "type": "string",
+                      "enum": [
+                        "House",
+                        "Bungalow",
+                        "Maisonette",
+                        "Flat",
+                        "Park home",
+                        "Other"
+                      ]
+                    }
+                  },
+                  "discriminator": {
+                    "propertyName": "propertyType"
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "propertyType": {
+                          "enum": ["Other"]
+                        },
+                        "otherType": {
+                          "ntsRef": "B1.1.1.1",
+                          "title": "Please describe the other type of property build",
+                          "type": "string",
+                          "minLength": 1
+                        }
+                      },
+                      "ntsRequired": ["otherType"]
+                    },
+                    {
+                      "properties": {
+                        "propertyType": {
+                          "enum": ["House", "Bungalow"]
+                        },
+                        "builtForm": {
+                          "ntsRef": "B1.1.2",
+                          "title": "Built form",
+                          "type": "string",
+                          "enum": [
+                            "Detached",
+                            "Semi-detached",
+                            "Terraced",
+                            "End of terrace",
+                            "Other"
+                          ]
+                        }
+                      },
+                      "ntsRequired": ["builtForm"]
+                    },
+                    {
+                      "properties": {
+                        "propertyType": {
+                          "enum": ["Maisonette", "Flat"]
+                        },
+                        "builtForm": {
+                          "ntsRef": "B1.1.2",
+                          "title": "Built form",
+                          "type": "string",
+                          "enum": [
+                            "Detached",
+                            "Semi-detached",
+                            "Terraced",
+                            "End of terrace",
+                            "Other"
+                          ]
+                        },
+                        "numberOfFloors": {
+                          "ntsRef": "B1.1.3",
+                          "title": "Number of floors in the building",
+                          "type": "integer"
+                        },
+                        "entranceFloor": {
+                          "ntsRef": "B1.1.4",
+                          "title": "Entrance floor",
+                          "description": "The floor on which the main entrance to the property is located, starting with 1 for the ground floor (0 for a basement)",
+                          "type": "integer"
+                        },
+                        "hasLift": {
+                          "ntsRef": "B1.1.5",
+                          "title": "Entrance floor",
+                          "description": "Is the property served by a lift?",
+                          "type": "string",
+                          "enum": ["Yes", "No"]
+                        },
+                        "overCommercialPremises": {
+                          "ntsRef": "B1.1.6",
+                          "title": "Is the property located over commercial premises?",
+                          "type": "object",
+                          "properties": {
+                            "isLocatedOverCommercialPremises": {
+                              "ntsRef": "B1.1.6.1",
+                              "type": "string",
+                              "title": "Is the property located over commercial premises?",
+                              "enum": ["Yes", "No"]
+                            }
+                          },
+                          "required": ["isLocatedOverCommercialPremises"],
+                          "discriminator": {
+                            "propertyName": "isLocatedOverCommercialPremises"
+                          },
+                          "oneOf": [
+                            {
+                              "properties": {
+                                "isLocatedOverCommercialPremises": {
+                                  "enum": ["No"]
+                                }
+                              }
+                            },
+                            {
+                              "properties": {
+                                "isLocatedOverCommercialPremises": {
+                                  "enum": ["Yes"]
+                                },
+                                "details": {
+                                  "ntsRef": "B1.1.6.2",
+                                  "title": "Please provide details",
+                                  "type": "string",
+                                  "minLength": 1
+                                }
+                              },
+                              "ntsRequired": ["details"]
+                            }
+                          ]
+                        }
+                      },
+                      "ntsRequired": [
+                        "builtForm",
+                        "numberOfFloors",
+                        "entranceFloor",
+                        "hasLift",
+                        "overCommercialPremises"
+                      ]
+                    }
+                  ]
+                },
                 "internalArea": {
                   "title": "Total internal floor area",
                   "type": "object",
@@ -582,65 +608,123 @@
                   "title": "Year the property was built",
                   "type": "integer"
                 },
-                "rooms": {
+                "isNewBuild": {
+                  "title": "Is the property a New Build?",
+                  "type": "object",
+                  "properties": {
+                    "yesNo": {
+                      "type": "string",
+                      "enum": ["Yes", "No"]
+                    }
+                  }
+                },
+                "roomDimensions": {
                   "ntsRef": "B2",
-                  "title": "Rooms",
-                  "description": "Information about the property's rooms",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "roomName": {
-                        "ntsRef": "B2.1",
-                        "type": "string",
-                        "title": "The name of the room",
-                        "minLength": 1
-                      },
-                      "description": {
-                        "ntsRef": "B2.2",
-                        "type": "string",
-                        "minLength": 1,
-                        "title": "The specific description of the room"
-                      },
-                      "length": {
-                        "ntsRef": "B2.3",
-                        "type": "number",
-                        "minimum": 0,
-                        "title": "The length of the room"
-                      },
-                      "width": {
-                        "ntsRef": "B2.4",
-                        "type": "number",
-                        "minimum": 0,
-                        "title": "The width of the room"
-                      },
-                      "units": {
-                        "ntsRef": "B2.5",
-                        "title": "The units which the length and width of the room have been provided in",
-                        "type": "string",
-                        "enum": [
-                          "meters",
-                          "centimetres",
-                          "millimetres",
-                          "feet",
-                          "inches"
-                        ]
+                  "title": "Room dimensions",
+                  "type": "object",
+                  "baspiRequired": ["hasFloorplan"],
+                  "properties": {
+                    "hasFloorplan": {
+                      "ntsRef": "B2.1",
+                      "title": "Is a floorplan available which includes the dimensions of all the rooms?",
+                      "type": "object",
+                      "properties": {
+                        "yesNo": {
+                          "ntsRef": "B2.1.1",
+                          "type": "string",
+                          "title": "",
+                          "enum": ["Yes", "No"]
+                        }
                       },
-                      "dimensionDetails": {
-                        "ntsRef": "B2.6",
-                        "title": "Any additional description or clarification of the room dimensions",
-                        "type": "string",
-                        "minLength": 1
+                      "ntsRequired": ["yesNo"],
+                      "discriminator": {
+                        "propertyName": "yesNo"
                       },
-                      "photoUrls": {
-                        "ntsRef": "B2.7",
-                        "title": "The URLs of images which should be associated with this room",
-                        "type": "array",
-                        "items": {
-                          "type": "string",
-                          "format": "uri"
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": ["Yes"]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": ["No"]
+                            },
+                            "rooms": {
+                              "ntsRef": "B2",
+                              "title": "Rooms",
+                              "description": "Please supply dimensions for each of the rooms.",
+                              "type": "array",
+                              "items": {
+                                "type": "object",
+                                "properties": {
+                                  "roomName": {
+                                    "ntsRef": "B2.1.1",
+                                    "type": "string",
+                                    "title": "The name of the room",
+                                    "minLength": 1
+                                  },
+                                  "description": {
+                                    "ntsRef": "B2.1.2",
+                                    "type": "string",
+                                    "minLength": 1,
+                                    "title": "Description of the room"
+                                  },
+                                  "length": {
+                                    "ntsRef": "B2.1.3",
+                                    "type": "number",
+                                    "minimum": 0,
+                                    "title": "The length of the room"
+                                  },
+                                  "width": {
+                                    "ntsRef": "B2.1.4",
+                                    "type": "number",
+                                    "minimum": 0,
+                                    "title": "The width of the room"
+                                  },
+                                  "units": {
+                                    "ntsRef": "B2.1.5",
+                                    "title": "The units which the length and width of the room have been provided in",
+                                    "type": "string",
+                                    "enum": [
+                                      "meters",
+                                      "centimetres",
+                                      "millimetres",
+                                      "feet",
+                                      "inches"
+                                    ]
+                                  },
+                                  "dimensionDetails": {
+                                    "ntsRef": "B2.6",
+                                    "title": "Any additional description or clarification of the room dimensions",
+                                    "type": "string",
+                                    "minLength": 1
+                                  },
+                                  "photoUrls": {
+                                    "ntsRef": "B2.7",
+                                    "title": "The URLs of images which should be associated with this room",
+                                    "type": "array",
+                                    "items": {
+                                      "type": "string",
+                                      "format": "uri"
+                                    }
+                                  }
+                                },
+                                "ntsRequired": [
+                                  "roomName",
+                                  "length",
+                                  "width",
+                                  "units"
+                                ]
+                              }
+                            }
+                          },
+                          "ntsRequired": ["rooms"]
                         }
-                      }
+                      ]
                     }
                   }
                 }
@@ -1216,9 +1300,11 @@
                   "items": {
                     "baspiRef": "A1.3.0",
                     "ntsRef": "A3.1",
+                    "ta7Ref": "1",
                     "title": "Ownership to be transferred",
                     "type": "object",
                     "baspiRequired": ["ownershipType"],
+                    "ta7Required": ["ownershipType"],
                     "ntsRequired": ["ownershipType"],
                     "properties": {
                       "titleNumber": {
@@ -1228,6 +1314,7 @@
                         "minLength": 1
                       },
                       "ownershipType": {
+                        "ntsRef": "A3.1",
                         "baspiRef": "A1.3.0.2",
                         "rdsRef": "Tenure/Tenure",
                         "ta7Ref": "1.1",
@@ -1303,6 +1390,7 @@
                           },
                           "managedFreeholdOrCommonholdInformation": {
                             "title": "Managed freehold or commonhold information",
+                            "ntsRef": "A3.2",
                             "baspiRef": "A1.5",
                             "type": "object",
                             "fme1Required": [
@@ -1318,6 +1406,7 @@
                               "contactDetails",
                               "serviceCharge"
                             ],
+                            "ntsRequired": ["serviceCharge"],
                             "properties": {
                               "contactDetails": {
                                 "fme1Ref": "1",
@@ -1791,10 +1880,9 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": ["true", "false"]
-                                            }
+                                            "fme1Ref": "1.5.1",
+                                            "type": "string",
+                                            "enum": ["true", "false"]
                                           }
                                         },
                                         "fme1Required": ["isApplicableParty"],
@@ -1835,10 +1923,8 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": ["true", "false"]
-                                            }
+                                            "type": "string",
+                                            "enum": ["true", "false"]
                                           }
                                         },
                                         "fme1Required": ["isApplicableParty"],
@@ -1879,10 +1965,8 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": ["true", "false"]
-                                            }
+                                            "type": "string",
+                                            "enum": ["true", "false"]
                                           }
                                         },
                                         "fme1Required": ["isApplicableParty"],
@@ -1923,10 +2007,8 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": ["true", "false"]
-                                            }
+                                            "type": "string",
+                                            "enum": ["true", "false"]
                                           }
                                         },
                                         "fme1Required": ["isApplicableParty"],
@@ -1966,10 +2048,8 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": ["true", "false"]
-                                            }
+                                            "type": "string",
+                                            "enum": ["true", "false"]
                                           }
                                         },
                                         "fme1Required": ["isApplicableParty"],
@@ -2296,6 +2376,7 @@
                               },
                               "serviceCharge": {
                                 "baspiRef": "A1.5.1",
+                                "ntsRef": "A3.1.1",
                                 "fme1Ref": "3",
                                 "piqRef": "A1.4.2",
                                 "title": "Service Charge",
@@ -2321,8 +2402,10 @@
                                   "largeAdditionalExpense",
                                   "reserveFund"
                                 ],
+                                "ntsRequired": ["annualServiceCharge"],
                                 "properties": {
                                   "annualServiceCharge": {
+                                    "ntsRef": "A3.1.2",
                                     "baspiRef": "A1.5.1.1.2",
                                     "fme1Ref": "3.1",
                                     "title": "What is the annual Service Charge payable by this Property?",
@@ -4379,6 +4462,7 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
+                                                "lpe1Ref": "1.6.1",
                                                 "type": "string",
                                                 "enum": ["true", "false"]
                                               }
@@ -4423,10 +4507,8 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -4469,10 +4551,8 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -4514,10 +4594,8 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -4634,10 +4712,9 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "lpe1Ref": "1.5",
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -4680,10 +4757,8 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -4726,10 +4801,8 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -4772,10 +4845,8 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -4817,10 +4888,8 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": ["true", "false"]
-                                                }
+                                                "type": "string",
+                                                "enum": ["true", "false"]
                                               }
                                             },
                                             "lpe1Required": [
@@ -5245,6 +5314,7 @@
                                       }
                                     },
                                     "lpe1Required": ["yesNo"],
+                                    "ta7Required": ["yesNo"],
                                     "discriminator": {
                                       "propertyName": "yesNo"
                                     },
@@ -5277,6 +5347,7 @@
                                     "title": "Is the seller aware of any changes in the terms of the lease or of the landlord giving any consents under the lease?",
                                     "type": "object",
                                     "lpe1Required": ["isSellerAwareOfChanges"],
+                                    "ta7Required": ["isSellerAwareOfChanges"],
                                     "properties": {
                                       "isSellerAwareOfChanges": {
                                         "title": "",
@@ -5442,6 +5513,7 @@
                                           }
                                         },
                                         "lpe1Required": ["yesNo"],
+                                        "ta7Required": ["yesNo"],
                                         "baspiRequired": ["yesNo"],
                                         "ntsRequired": ["yesNo"],
                                         "discriminator": {
@@ -5603,6 +5675,7 @@
                                       }
                                     },
                                     "lpe1Required": ["yesNo"],
+                                    "ta7Required": ["yesNo"],
                                     "discriminator": {
                                       "propertyName": "yesNo"
                                     },
@@ -5637,6 +5710,7 @@
                                     "title": "Who is responsible for managing the building?",
                                     "type": "object",
                                     "lpe1Required": ["buildingManagerType"],
+                                    "ta7Required": ["buildingManagerType"],
                                     "properties": {
                                       "buildingManagerType": {
                                         "title": "",
@@ -5698,6 +5772,7 @@
                               "serviceCharge": {
                                 "baspiRef": "A1.5.1",
                                 "lpe1Ref": "4",
+                                "ta7Ref": "5.4",
                                 "ntsRef": "A3.5",
                                 "title": "Service Charge",
                                 "type": "object",
@@ -5710,6 +5785,9 @@
                                 "ntsRequired": [
                                   "sellerContributesToServiceCharge"
                                 ],
+                                "ta7Required": [
+                                  "sellerContributesToServiceCharge"
+                                ],
                                 "properties": {
                                   "sellerContributesToServiceCharge": {
                                     "baspiRef": "A1.5.1.1",
@@ -5758,6 +5836,7 @@
                                           }
                                         },
                                         "lpe1Required": ["yesNo"],
+                                        "ta7Required": ["yesNo"],
                                         "baspiRequired": ["yesNo"],
                                         "discriminator": {
                                           "propertyName": "yesNo"
@@ -5800,6 +5879,7 @@
                                           }
                                         },
                                         "lpe1Required": ["yesNo"],
+                                        "ta7Required": ["yesNo"],
                                         "discriminator": {
                                           "propertyName": "yesNo"
                                         },
@@ -5839,6 +5919,7 @@
                                           }
                                         },
                                         "lpe1Required": ["yesNo"],
+                                        "ta7Required": ["yesNo"],
                                         "discriminator": {
                                           "propertyName": "yesNo"
                                         },
@@ -5884,6 +5965,7 @@
                                           }
                                         },
                                         "lpe1Required": ["yesNo"],
+                                        "ta7Required": ["yesNo"],
                                         "discriminator": {
                                           "propertyName": "yesNo"
                                         },
@@ -5922,6 +6004,7 @@
                                           }
                                         },
                                         "lpe1Required": ["yesNo"],
+                                        "ta7Required": ["yesNo"],
                                         "discriminator": {
                                           "propertyName": "yesNo"
                                         },
@@ -6518,7 +6601,8 @@
                                             ]
                                           }
                                         ],
-                                        "lpe1Required": ["yesNoNotApplicable"]
+                                        "lpe1Required": ["yesNoNotApplicable"],
+                                        "ta7Required": ["yesNoNotApplicable"]
                                       },
                                       "landlordsCertificateServed": {
                                         "lpe1Ref": "4.14",
@@ -6567,7 +6651,8 @@
                                       "annualServiceCharge",
                                       "largeAdditionalExpense",
                                       "reserveFund"
-                                    ]
+                                    ],
+                                    "ntsRequired": ["annualServiceCharge"]
                                   }
                                 ]
                               },
@@ -7059,6 +7144,7 @@
                                         "enum": ["Yes", "No"]
                                       }
                                     },
+                                    "ta7Required": ["yesNo"],
                                     "lpe1Required": ["yesNo"],
                                     "discriminator": {
                                       "propertyName": "yesNo"
@@ -7100,6 +7186,7 @@
                                       }
                                     },
                                     "lpe1Required": ["yesNo"],
+                                    "ta7Required": ["yesNo"],
                                     "discriminator": {
                                       "propertyName": "yesNo"
                                     },
@@ -7297,6 +7384,7 @@
                                       }
                                     },
                                     "lpe1Required": ["yesNo"],
+                                    "ta7Required": ["yesNo"],
                                     "discriminator": {
                                       "propertyName": "yesNo"
                                     },
@@ -7933,13 +8021,15 @@
                             "enum": ["Other"]
                           },
                           "otherOwnershipDetails": {
+                            "ntsRef": "A3.5",
                             "baspiRef": "A1.3.2",
                             "title": "Details of the ownership type",
                             "type": "string",
                             "minLength": 1
                           }
                         },
-                        "baspiRequired": ["otherOwnershipDetails"]
+                        "baspiRequired": ["otherOwnershipDetails"],
+                        "ntsRequired": ["otherOwnershipDetails"]
                       }
                     ]
                   }
@@ -7973,6 +8063,7 @@
                   "type": "array",
                   "title": "Parking arrangements",
                   "items": {
+                    "ntsRef": "B4.1.1",
                     "type": "string",
                     "enum": [
                       "Allocated",
@@ -7999,6 +8090,7 @@
                   "type": "object",
                   "properties": {
                     "yesNo": {
+                      "ntsRef": "B4.2.1",
                       "baspiRef": "A1.6.2.1",
                       "ta6Ref": "9.2.1",
                       "type": "string",
@@ -8017,6 +8109,7 @@
                   "type": "object",
                   "properties": {
                     "yesNo": {
+                      "ntsRef": "B4.2.1",
                       "baspiRef": "A1.6.1.1",
                       "type": "string",
                       "title": "",
@@ -8090,9 +8183,10 @@
                           "enum": ["Yes"]
                         },
                         "details": {
+                          "ntsRef": "C2.1.1.2",
                           "baspiRef": "A1.7.1.2",
                           "ta6Ref": "4.7a2",
-                          "title": "Please provide details of the listing and any relevant documents",
+                          "title": "Please provide details of the listing",
                           "type": "string",
                           "minLength": 1
                         },
@@ -8104,6 +8198,7 @@
                           "enum": ["Attached", "To follow"]
                         }
                       },
+                      "ntsRequired": ["details"],
                       "baspiRequired": ["details", "attachments"],
                       "ta6Required": ["details", "attachments"]
                     }
@@ -8148,9 +8243,10 @@
                           "enum": ["Yes"]
                         },
                         "details": {
+                          "ntsRef": "C2.1.2.2",
                           "baspiRef": "A1.7.2.2",
                           "ta6Ref": "4.7b2",
-                          "title": "Please provide details of the listing and any relevant documents",
+                          "title": "Please provide details of the listing",
                           "type": "string",
                           "minLength": 1
                         },
@@ -8162,6 +8258,7 @@
                           "enum": ["Attached", "To follow"]
                         }
                       },
+                      "ntsRequired": ["details"],
                       "baspiRequired": ["details", "attachments"],
                       "ta6Required": ["details", "attachments"]
                     }
@@ -8206,6 +8303,7 @@
                           "enum": ["Yes"]
                         },
                         "workCarriedOut": {
+                          "ntsRef": "C2.1.3.2",
                           "baspiRef": "A1.7.3.2",
                           "rdsRef": "WorksAlterationsChanges",
                           "ta6Ref": "4.8a",
@@ -8223,6 +8321,7 @@
                             }
                           },
                           "baspiRequired": ["yesNo"],
+                          "ntsRequired": ["yesNo"],
                           "ta6Required": ["yesNo"],
                           "discriminator": {
                             "propertyName": "yesNo"
@@ -8241,6 +8340,7 @@
                                   "enum": ["Yes"]
                                 },
                                 "consentsObtained": {
+                                  "ntsRef": "C2.1.3.3",
                                   "baspiRef": "A1.7.3.3",
                                   "ta6Ref": "4.8a2",
                                   "title": "Were the relevant consents obtained?",
@@ -8256,6 +8356,7 @@
                                   "enum": ["Attached", "To follow"]
                                 }
                               },
+                              "ntsRequired": ["consentsObtained"],
                               "baspiRequired": ["consentsObtained"],
                               "ta6Required": ["consentsObtained"]
                             }
@@ -10419,6 +10520,7 @@
             "notices": {
               "baspiRef": "A4",
               "ta6Ref": "3",
+              "ntsRef": "C4",
               "title": "Notices which Affect the Property",
               "description": "Are you aware of, or have you received, any of the following notices?",
               "type": "object",
@@ -10431,6 +10533,7 @@
                 "partyWallAct",
                 "otherNotices"
               ],
+              "ntsRequired": ["neighbourDevelopment", "planningApplication"],
               "ta6Required": [
                 "neighbourDevelopment",
                 "partyWallAct",
@@ -10439,6 +10542,7 @@
               "properties": {
                 "neighbourDevelopment": {
                   "baspiRef": "A4.1",
+                  "ntsRef": "C4.1",
                   "ta6Ref": "3.2",
                   "rdsRef": "Property/Flags,Planning",
                   "piqRef": "A4.1",
@@ -10446,6 +10550,7 @@
                   "type": "object",
                   "properties": {
                     "yesNo": {
+                      "ntsRef": "C4.1.1",
                       "baspiRef": "A4.1.1",
                       "piqRef": "A4.1.1",
                       "ta6Ref": "3.2.1",
@@ -10455,6 +10560,7 @@
                     }
                   },
                   "baspiRequired": ["yesNo"],
+                  "ntsRequired": ["yesNo"],
                   "ta6Required": ["yesNo"],
                   "discriminator": {
                     "propertyName": "yesNo"
@@ -10473,6 +10579,7 @@
                           "enum": ["Yes"]
                         },
                         "details": {
+                          "ntsRef": "C4.1.2",
                           "baspiRef": "A4.1.2",
                           "ta6Ref": "3.2.2",
                           "title": "Details",
@@ -10487,11 +10594,13 @@
                         }
                       },
                       "baspiRequired": ["details", "attachments"],
-                      "ta6Required": ["details"]
+                      "ta6Required": ["details"],
+                      "ntsRequired": ["details"]
                     }
                   ]
                 },
                 "planningApplication": {
+                  "ntsRef": "C4.2",
                   "baspiRef": "A4.2",
                   "rdsRef": "Property/Flags,Planning",
                   "ta6Ref": "3.1",
@@ -10500,6 +10609,7 @@
                   "type": "object",
                   "properties": {
                     "yesNo": {
+                      "ntsRef": "C4.2.1",
                       "baspiRef": "A4.2.1",
                       "ta6Ref": "3.1.1",
                       "piqRef": "A4.2.1",
@@ -10509,6 +10619,7 @@
                     }
                   },
                   "baspiRequired": ["yesNo"],
+                  "ntsRequired": ["yesNo"],
                   "ta6Required": ["yesNo"],
                   "discriminator": {
                     "propertyName": "yesNo"
@@ -10527,6 +10638,7 @@
                           "enum": ["Yes"]
                         },
                         "details": {
+                          "ntsRef": "C4.2.2",
                           "baspiRef": "A4.2.2",
                           "ta6Ref": "3.1.2",
                           "title": "Details",
@@ -10541,7 +10653,8 @@
                         }
                       },
                       "baspiRequired": ["details", "attachments"],
-                      "ta6Required": ["details"]
+                      "ta6Required": ["details"],
+                      "ntsRequired": ["details"]
                     }
                   ]
                 },
@@ -17950,8 +18063,6 @@
               ],
               "ntsRequired": [
                 "mainsElectricity",
-                "telephone",
-                "cableSatelliteTV",
                 "broadband",
                 "solarPanels",
                 "otherServices"
@@ -18546,7 +18657,7 @@
                         },
                         "details": {
                           "ntsRef": "3.8.2",
-                          "title": "Supplier",
+                          "title": "Details",
                           "type": "string"
                         },
                         "supplier": {
@@ -18638,6 +18749,7 @@
               "type": "object",
               "baspiRequired": ["water", "drainage", "maintenanceAgreements"],
               "ta6Required": ["water", "drainage"],
+              "ntsRequired": ["water", "drainage"],
               "con29DWRequired": ["maps", "water", "drainage", "charging"],
               "properties": {
                 "maps": {
@@ -18671,6 +18783,7 @@
                   "title": "Water",
                   "type": "object",
                   "baspiRequired": ["mainsWater"],
+                  "ntsRequired": ["mainsWater"],
                   "ta6Required": ["mainsWater"],
                   "con29DWRequired": [
                     "mainsWater",
@@ -18699,6 +18812,7 @@
                           "type": "string",
                           "title": "",
                           "enum": ["Yes", "To be connected", "No"],
+                          "ntsEnum": ["Yes", "No"],
                           "con29DWEnum": ["Yes", "No"]
                         }
                       },
@@ -18745,9 +18859,9 @@
                             },
                             "isSupplyMetered": {
                               "ntsRef": "3.2.3",
-                              "title": "Details",
+                              "title": "Is the supply metered?",
                               "type": "string",
-                              "minLength": 1
+                              "enum": ["Yes", "No"]
                             }
                           },
                           "ta6Required": ["supplier"],
@@ -18960,7 +19074,9 @@
                           "type": "string",
                           "title": "",
                           "enum": ["Yes", "To be connected", "No", "Not known"],
-                          "con29DWEnum": ["Yes", "No"]
+                          "con29DWEnum": ["Yes", "No"],
+                          "ntsEnum": ["Yes", "No", "Not known"],
+                          "ta6Enum": ["Yes", "No", "Not known"]
                         }
                       },
                       "baspiRequired": ["yesNo"],
@@ -18982,11 +19098,6 @@
                             "yesNo": {
                               "enum": ["Yes"]
                             },
-                            "supplier": {
-                              "baspiRef": "A7.1.0.12.2",
-                              "title": "Supplier",
-                              "type": "string"
-                            },
                             "details": {
                               "con29DWRef": "2.2.2",
                               "title": "Details",
@@ -19006,11 +19117,6 @@
                               "title": "Date to be connected",
                               "type": "string",
                               "format": "date"
-                            },
-                            "supplier": {
-                              "baspiRef": "A7.1.0.12.2",
-                              "title": "Supplier",
-                              "type": "string"
                             }
                           },
                           "baspiRequired": ["dateToBeConnected"]
@@ -19020,23 +19126,25 @@
                     "mainsFoulDrainage": {
                       "ntsRef": "A3.3.2",
                       "baspiRef": "A7.1.0.11",
-                      "rdsRef": "Services/WasteWaterSewarageDisposal",
+                      "rdsRef": "Services/WasteWaterSewerageDisposal",
                       "ta6Ref": "12.4a",
                       "con29DWRef": "2.1",
-                      "title": "Mains foul drainage / sweerage",
+                      "title": "Mains foul drainage / sewerage",
                       "type": "object",
                       "baspiRequired": ["yesNo"],
                       "ta6Required": ["yesNo"],
                       "ntsRequired": ["yesNo"],
                       "properties": {
                         "yesNo": {
+                          "ntsRef": "A3.3.2.1",
                           "baspiRef": "A7.1.0.11.1",
                           "ta6Ref": "12.4a1",
                           "type": "string",
                           "title": "",
                           "enum": ["Yes", "To be connected", "No", "Not known"],
                           "con29DWEnum": ["Yes", "No"],
-                          "ntsEnum": ["Yes", "No"]
+                          "ntsEnum": ["Yes", "No", "Not known"],
+                          "ta6Enum": ["Yes", "No", "Not known"]
                         }
                       },
                       "discriminator": {
@@ -19048,13 +19156,6 @@
                             "yesNo": {
                               "enum": ["Yes"]
                             },
-                            "supplier": {
-                              "baspiRef": "A7.1.0.11.3",
-                              "ta6Ref": "12.4a2",
-                              "title": "Supplier",
-                              "type": "string",
-                              "minLength": 1
-                            },
                             "details": {
                               "con29DWRef": "2.1.2",
                               "title": "Details",
@@ -19064,6 +19165,13 @@
                           },
                           "con29DWRequired": ["details"]
                         },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": ["Not known"]
+                            }
+                          }
+                        },
                         {
                           "properties": {
                             "yesNo": {
@@ -19087,107 +19195,252 @@
                         {
                           "properties": {
                             "yesNo": {
-                              "enum": ["No", "Not known"]
+                              "enum": ["No"]
                             },
-                            "sustainableDrainageSystem": {
+                            "offMainsDrainageSystem": {
                               "ntsRef": "A3.3.3",
-                              "baspiRef": "A7.1.0.13",
-                              "rdsRef": "Services/OtherServices/{description=?,type=?},Services/OtherServices/Installed|Upgraded|Replaced|Serviced|Certificates",
-                              "title": "Sustainable Drainage System",
+                              "baspiRef": "A7.1.10.13",
+                              "ta6Ref": "12.4a",
                               "type": "object",
+                              "baspiRequired": [
+                                "offMainsDrainageSystemType",
+                                "otherConnectedProperties",
+                                "plantOnOtherLand",
+                                "plantRegistered",
+                                "plantDrainsIntoWaterway"
+                              ],
+                              "ntsRequired": ["offMainsDrainageSystemType"],
+                              "ta6Required": [
+                                "offMainsDrainageSystemType",
+                                "otherConnectedProperties",
+                                "plantOnOtherLand"
+                              ],
                               "properties": {
-                                "yesNo": {
+                                "offMainsDrainageSystemType": {
                                   "ntsRef": "A3.3.3.1",
-                                  "baspiRef": "A7.1.0.13.1",
+                                  "baspiRef": "A7.",
                                   "type": "string",
-                                  "title": "",
-                                  "enum": ["Yes", "To be connected", "No"],
-                                  "ntsEnum": ["Yes", "No"]
-                                }
-                              },
-                              "baspiRequired": ["yesNo"],
-                              "ntsRequired": ["yesNo"],
-                              "discriminator": {
-                                "propertyName": "yesNo"
-                              },
-                              "oneOf": [
-                                {
+                                  "enum": [
+                                    "Sustainable Drainage System",
+                                    "Septic tank",
+                                    "Cesspit",
+                                    "Sewerage treatment plant"
+                                  ]
+                                },
+                                "otherConnectedProperties": {
+                                  "baspiRef": "A7.1.1",
+                                  "rdsRef": "Services/OtherServices/SharedWith",
+                                  "ta6Ref": "12.6",
+                                  "piqRef": "A7.1.29",
+                                  "title": "Do other properties connect to the septic tank, cesspit or sewerage treatment plant?",
+                                  "type": "object",
                                   "properties": {
                                     "yesNo": {
-                                      "enum": ["No"]
+                                      "baspiRef": "A7.1.1.1",
+                                      "ta6Ref": "12.6.1",
+                                      "type": "string",
+                                      "title": "",
+                                      "enum": ["Yes", "No"]
                                     }
-                                  }
+                                  },
+                                  "baspiRequired": ["yesNo"],
+                                  "ta6Required": ["yesNo"],
+                                  "discriminator": {
+                                    "propertyName": "yesNo"
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": ["No"]
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": ["Yes"]
+                                        },
+                                        "numberOfPropertiesSharing": {
+                                          "baspiRef": "A7.1.1.1",
+                                          "ta6Ref": "12.6.2",
+                                          "title": "How many other properties?",
+                                          "type": "integer"
+                                        },
+                                        "details": {
+                                          "baspiRef": "A7.1.1.2",
+                                          "title": "Provide details of the properties sharing the system and explain how maintenance of the system is arranged and paid for",
+                                          "type": "string",
+                                          "minLength": 1
+                                        }
+                                      },
+                                      "baspiRequired": [
+                                        "numberOfPropertiesSharing",
+                                        "details"
+                                      ],
+                                      "ta6Required": [
+                                        "numberOfPropertiesSharing"
+                                      ]
+                                    }
+                                  ]
                                 },
-                                {
+                                "plantOnOtherLand": {
+                                  "baspiRef": "A7.1.2",
+                                  "rdsRef": "Services/OtherServices/Located,Services/OtherServices/{access=?}",
+                                  "ta6Ref": "12.10",
+                                  "piqRef": "A7.1.30",
+                                  "title": "Is any part of the septic tank, cesspit or sewerage treatment plant located on someone else’s land?",
+                                  "type": "object",
                                   "properties": {
                                     "yesNo": {
-                                      "enum": ["Yes"]
+                                      "baspiRef": "7.1.2.1",
+                                      "ta6Ref": "12.10.1",
+                                      "type": "string",
+                                      "title": "",
+                                      "enum": ["Yes", "No"]
+                                    }
+                                  },
+                                  "baspiRequired": ["yesNo"],
+                                  "discriminator": {
+                                    "propertyName": "yesNo"
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": ["No"]
+                                        }
+                                      }
                                     },
-                                    "supplier": {
-                                      "baspiRef": "A7.1.0.13.3",
-                                      "title": "Supplier",
-                                      "type": "string"
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": ["Yes"]
+                                        },
+                                        "attachments": {
+                                          "baspiRef": "7.1.2.2",
+                                          "ta6Ref": "12.10.2",
+                                          "title": "Please supply a plan showing the location of the system and how access is obtained.",
+                                          "type": "string",
+                                          "enum": ["Attached", "To follow"]
+                                        }
+                                      },
+                                      "baspiRequired": ["attachments"],
+                                      "ta6Required": ["attachments"]
                                     }
-                                  }
+                                  ],
+                                  "ta6Required": ["yesNo"]
                                 },
-                                {
+                                "plantRegistered": {
+                                  "baspiRef": "A7.1.3",
+                                  "rdsRef": "Services/OtherServices/Certificates",
+                                  "piqRef": "A7.1.31",
+                                  "title": "Is the septic tank, cesspit or sewerage treatment plant registered with the Environment Agency or exempted?",
+                                  "type": "object",
                                   "properties": {
                                     "yesNo": {
-                                      "enum": ["To be connected"]
-                                    },
-                                    "dateToBeConnected": {
-                                      "baspiRef": "A7.1.0.13.2",
-                                      "title": "Date to be connected",
+                                      "baspiRef": "A7.1.3.1",
                                       "type": "string",
-                                      "format": "date"
+                                      "title": "",
+                                      "enum": ["Yes", "No"]
+                                    }
+                                  },
+                                  "baspiRequired": ["yesNo"],
+                                  "discriminator": {
+                                    "propertyName": "yesNo"
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": ["No"]
+                                        }
+                                      }
                                     },
-                                    "supplier": {
-                                      "baspiRef": "A7.1.0.13.3",
-                                      "title": "Supplier",
-                                      "type": "string"
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": ["Yes"]
+                                        },
+                                        "attachments": {
+                                          "baspiRef": "A7.1.3.2",
+                                          "title": "Please supply the appropriate permit to discharge or exemption certificate",
+                                          "type": "string",
+                                          "enum": ["Attached", "To follow"]
+                                        }
+                                      },
+                                      "baspiRequired": ["attachments"]
+                                    }
+                                  ]
+                                },
+                                "plantDrainsIntoWaterway": {
+                                  "baspiRef": "A7.1.4",
+                                  "rdsRef": "Services/OtherServices/{isExternallyConnected='yes?true'}",
+                                  "title": "Does the septic tank, cesspit or sewerage treatment plant drain into a waterway (lake, river, stream etc)",
+                                  "type": "object",
+                                  "properties": {
+                                    "yesNo": {
+                                      "baspiRef": "A7.1.4.1",
+                                      "type": "string",
+                                      "title": "",
+                                      "enum": [
+                                        "Yes",
+                                        "No, the effluent is discharged through a soakaway system."
+                                      ]
                                     }
                                   },
-                                  "baspiRequired": ["dateToBeConnected"]
-                                }
-                              ]
-                            },
-                            "septicTank": {
-                              "ntsRef": "A3.3.4",
-                              "baspiRef": "A7.1.0.14",
-                              "rdsRef": "Services/OtherServices/{description=?,type=?},Services/OtherServices/Installed|Upgraded|Replaced|Serviced|Certificates",
-                              "piqRef": "A7.1.23",
-                              "ta6Ref": "12.5a",
-                              "title": "Septic tank",
-                              "type": "object",
-                              "baspiRequired": ["yesNo"],
-                              "ntsRequired": ["yesNo"],
-                              "ta6Required": ["yesNo"],
-                              "properties": {
-                                "yesNo": {
-                                  "ntsRef": "A3.3.4.1",
-                                  "baspiRef": "A7.1.0.14.1",
-                                  "ta6Ref": "12.5a1",
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": ["Yes", "No"]
+                                  "baspiRequired": ["yesNo"],
+                                  "discriminator": {
+                                    "propertyName": "yesNo"
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "No, the effluent is discharged through a soakaway system."
+                                          ]
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": ["Yes"]
+                                        },
+                                        "dischargeCompliesWithGBR": {
+                                          "baspiRef": "A7.1.4.1",
+                                          "rdsRef": "Services/OtherServices/ExternalConnections/Flags",
+                                          "title": "Does it comply with the General Binding Rules for discharge into a waterway?",
+                                          "type": "string",
+                                          "enum": [
+                                            "Yes",
+                                            "No, it does not comply with the rules for discharge into a waterway."
+                                          ]
+                                        }
+                                      },
+                                      "baspiRequired": [
+                                        "dischargeCompliesWithGBR"
+                                      ]
+                                    }
+                                  ]
                                 }
                               },
-
                               "discriminator": {
-                                "propertyName": "yesNo"
+                                "propertyName": "offMainsDrainageSystemType"
                               },
                               "oneOf": [
                                 {
                                   "properties": {
-                                    "yesNo": {
-                                      "enum": ["No"]
+                                    "offMainsDrainageSystemType": {
+                                      "enum": ["Sustainable Drainage System"]
                                     }
                                   }
                                 },
                                 {
                                   "properties": {
-                                    "yesNo": {
-                                      "enum": ["Yes"]
+                                    "offMainsDrainageSystemType": {
+                                      "enum": ["Septic tank"]
                                     },
                                     "dateReplaced": {
                                       "baspiRef": "A7.1.0.14.2",
@@ -19213,46 +19466,11 @@
                                     "dateReplaced",
                                     "dateLastEmptied"
                                   ]
-                                }
-                              ]
-                            },
-                            "cesspit": {
-                              "ntsRef": "A3.3.5",
-                              "baspiRef": "A7.1.0.15",
-                              "rdsRef": "Services/OtherServices/{description=?,type=?},Services/OtherServices/Installed|Upgraded|Replaced|Serviced|Certificates",
-                              "ta6Ref": "12.5b",
-                              "piqRef": "A7.1.25",
-                              "title": "Cesspit",
-                              "type": "object",
-                              "baspiRequired": ["yesNo"],
-                              "ntsRequired": ["yesNo"],
-                              "ta6Required": ["yesNo"],
-                              "properties": {
-                                "yesNo": {
-                                  "ntsRef": "A3.3.5.1",
-                                  "baspiRef": "A7.1.0.15.1",
-                                  "ta6Ref": "12.5c1",
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": ["Yes", "No"]
-                                }
-                              },
-
-                              "discriminator": {
-                                "propertyName": "yesNo"
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["No"]
-                                    }
-                                  }
                                 },
                                 {
                                   "properties": {
-                                    "yesNo": {
-                                      "enum": ["Yes"]
+                                    "offMainsDrainageSystemType": {
+                                      "enum": ["Cesspit"]
                                     },
                                     "dateLastEmptied": {
                                       "baspiRef": "A7.1.0.15.2",
@@ -19265,46 +19483,11 @@
                                   },
                                   "baspiRequired": ["dateLastEmptied"],
                                   "ta6Required": ["dateLastEmptied"]
-                                }
-                              ]
-                            },
-                            "sewerageTreatmentPlant": {
-                              "ntsRef": "A3.3.6",
-                              "baspiRef": "A7.1.0.16",
-                              "rdsRef": "Services/OtherServices/{description=?,type=?},Services/OtherServices/Installed|Upgraded|Replaced|Serviced|Certificates",
-                              "ta6Ref": "12.5b",
-                              "piqRef": "A7.1.27",
-                              "title": "Sewerage treatment plant",
-                              "type": "object",
-                              "baspiRequired": ["yesNo"],
-                              "ntsRequired": ["yesNo"],
-                              "ta6Required": ["yesNo"],
-                              "properties": {
-                                "yesNo": {
-                                  "ntsRef": "A3.3.6.1",
-                                  "baspiRef": "A7.1.0.16.1",
-                                  "ta6Ref": "12.5b1",
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": ["Yes", "No"]
-                                }
-                              },
-
-                              "discriminator": {
-                                "propertyName": "yesNo"
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["No"]
-                                    }
-                                  }
                                 },
                                 {
                                   "properties": {
-                                    "yesNo": {
-                                      "enum": ["Yes"]
+                                    "offMainsDrainageSystemType": {
+                                      "enum": ["Sewerage treatment plant"]
                                     },
                                     "dateInstalled": {
                                       "baspiRef": "A7.1.0.16.2",
@@ -19342,225 +19525,8 @@
                                   ]
                                 }
                               ]
-                            },
-                            "otherConnectedProperties": {
-                              "baspiRef": "A7.1.1",
-                              "rdsRef": "Services/OtherServices/SharedWith",
-                              "ta6Ref": "12.6",
-                              "piqRef": "A7.1.29",
-                              "title": "Do other properties connect to the septic tank, cesspit or sewerage treatment plant?",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "baspiRef": "A7.1.1.1",
-                                  "ta6Ref": "12.6.1",
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": ["Yes", "No"]
-                                }
-                              },
-                              "baspiRequired": ["yesNo"],
-                              "ta6Required": ["yesNo"],
-                              "discriminator": {
-                                "propertyName": "yesNo"
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["No"]
-                                    }
-                                  }
-                                },
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["Yes"]
-                                    },
-                                    "numberOfPropertiesSharing": {
-                                      "baspiRef": "A7.1.1.1",
-                                      "ta6Ref": "12.6.2",
-                                      "title": "How many other properties?",
-                                      "type": "integer"
-                                    },
-                                    "details": {
-                                      "baspiRef": "A7.1.1.2",
-                                      "title": "Provide details of the properties sharing the system and explain how maintenance of the system is arranged and paid for",
-                                      "type": "string",
-                                      "minLength": 1
-                                    }
-                                  },
-                                  "baspiRequired": [
-                                    "numberOfPropertiesSharing",
-                                    "details"
-                                  ],
-                                  "ta6Required": ["numberOfPropertiesSharing"]
-                                }
-                              ]
-                            },
-                            "plantOnOtherLand": {
-                              "baspiRef": "A7.1.2",
-                              "rdsRef": "Services/OtherServices/Located,Services/OtherServices/{access=?}",
-                              "ta6Ref": "12.10",
-                              "piqRef": "A7.1.30",
-                              "title": "Is any part of the septic tank, cesspit or sewerage treatment plant located on someone else’s land?",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "baspiRef": "7.1.2.1",
-                                  "ta6Ref": "12.10.1",
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": ["Yes", "No"]
-                                }
-                              },
-                              "baspiRequired": ["yesNo"],
-                              "discriminator": {
-                                "propertyName": "yesNo"
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["No"]
-                                    }
-                                  }
-                                },
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["Yes"]
-                                    },
-                                    "attachments": {
-                                      "baspiRef": "7.1.2.2",
-                                      "ta6Ref": "12.10.2",
-                                      "title": "Please supply a plan showing the location of the system and how access is obtained.",
-                                      "type": "string",
-                                      "enum": ["Attached", "To follow"]
-                                    }
-                                  },
-                                  "baspiRequired": ["attachments"],
-                                  "ta6Required": ["attachments"]
-                                }
-                              ],
-                              "ta6Required": ["yesNo"]
-                            },
-                            "plantRegistered": {
-                              "baspiRef": "A7.1.3",
-                              "rdsRef": "Services/OtherServices/Certificates",
-                              "piqRef": "A7.1.31",
-                              "title": "Is the septic tank, cesspit or sewerage treatment plant registered with the Environment Agency or exempted?",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "baspiRef": "A7.1.3.1",
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": ["Yes", "No"]
-                                }
-                              },
-                              "baspiRequired": ["yesNo"],
-                              "discriminator": {
-                                "propertyName": "yesNo"
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["No"]
-                                    }
-                                  }
-                                },
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["Yes"]
-                                    },
-                                    "attachments": {
-                                      "baspiRef": "A7.1.3.2",
-                                      "title": "Please supply the appropriate permit to discharge or exemption certificate",
-                                      "type": "string",
-                                      "enum": ["Attached", "To follow"]
-                                    }
-                                  },
-                                  "baspiRequired": ["attachments"]
-                                }
-                              ]
-                            },
-                            "plantDrainsIntoWaterway": {
-                              "baspiRef": "A7.1.4",
-                              "rdsRef": "Services/OtherServices/{isExternallyConnected='yes?true'}",
-                              "title": "Does the septic tank, cesspit or sewerage treatment plant drain into a waterway (lake, river, stream etc)",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "baspiRef": "A7.1.4.1",
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No, the effluent is discharged through a soakaway system."
-                                  ]
-                                }
-                              },
-                              "baspiRequired": ["yesNo"],
-                              "discriminator": {
-                                "propertyName": "yesNo"
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "No, the effluent is discharged through a soakaway system."
-                                      ]
-                                    }
-                                  }
-                                },
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": ["Yes"]
-                                    },
-                                    "dischargeCompliesWithGBR": {
-                                      "baspiRef": "A7.1.4.1",
-                                      "rdsRef": "Services/OtherServices/ExternalConnections/Flags",
-                                      "title": "Does it comply with the General Binding Rules for discharge into a waterway?",
-                                      "type": "string",
-                                      "enum": [
-                                        "Yes",
-                                        "No, it does not comply with the rules for discharge into a waterway."
-                                      ]
-                                    }
-                                  },
-                                  "baspiRequired": ["dischargeCompliesWithGBR"]
-                                }
-                              ]
                             }
-                          },
-                          "baspiRequired": [
-                            "sustainableDrainageSystem",
-                            "septicTank",
-                            "cesspit",
-                            "sewerageTreatmentPlant",
-                            "otherConnectedProperties",
-                            "plantOnOtherLand",
-                            "plantRegistered",
-                            "plantDrainsIntoWaterway"
-                          ],
-                          "ntsRequired": [
-                            "sustainableDrainageSystem",
-                            "septicTank",
-                            "cesspit",
-                            "sewerageTreatmentPlant"
-                          ],
-                          "ta6Required": [
-                            "septicTank",
-                            "cesspit",
-                            "sewerageTreatmentPlant",
-                            "otherConnectedProperties",
-                            "plantOnOtherLand"
-                          ]
+                          }
                         }
                       ]
                     },
@@ -20099,6 +20065,7 @@
                                 "Electricity",
                                 "Oil",
                                 "LPG",
+                                "Biomass",
                                 "Other"
                               ]
                             }
@@ -20115,7 +20082,7 @@
                                     "Electricity",
                                     "Oil",
                                     "LPG",
-                                    "Biomass boiler"
+                                    "Biomass"
                                   ]
                                 }
                               }
@@ -20802,6 +20769,7 @@
                 "accessRestrictionAttempts",
                 "rightsOrArrangements"
               ],
+              "ntsRequired": ["rightsOrArrangements"],
               "ta6Required": [
                 "sharedContributions",
                 "neighbouringLandRights",
@@ -20996,6 +20964,7 @@
                       "ta6Ref": "8.6",
                       "piqRef": "A10.4",
                       "title": "A public right of way through and/or across your property, buildings or land",
+                      "ntsTitle": "Is there a public right of way through and/or across your house, buildings or land?",
                       "type": "object",
                       "properties": {
                         "yesNo": {
@@ -21032,13 +21001,13 @@
                               "baspiRef": "A10.4.1.2",
                               "ta6Ref": "8.6.2",
                               "piqRef": "A10.4.2",
-                              "title": "Please provide details and mark the route on a plan of the property",
+                              "title": "Please provide details",
                               "type": "string",
                               "minLength": 1
                             },
                             "attachments": {
                               "baspiRef": "A10.4.1.3",
-                              "title": "Attachments",
+                              "title": "Please mark the route on a plan of the property",
                               "type": "string",
                               "enum": ["Attached", "To follow"]
                             }
@@ -21402,21 +21371,20 @@
                   "ta6Ref": "7.1.0",
                   "title": "Flooding",
                   "type": "object",
-                  "baspiRequired": ["floodRisk", "hasBeenFlooded"],
+                  "baspiRequired": ["hasBeenFlooded"],
                   "ntsRequired": ["floodRisk", "hasBeenFlooded"],
                   "ta6Required": ["hasBeenFlooded"],
                   "properties": {
                     "floodRisk": {
                       "ntsRef": "C3.1.1.1",
-                      "baspiRef": "A11.1.1",
                       "rdsRef": "Sustainability/Environmental|Natural|Situational",
                       "piqRef": "A11.1.1",
                       "title": "Flood Risk",
                       "type": "object",
-                      "ntsRequired": ["impactIndicator"],
-                      "baspiRequired": ["impactIndicator"],
+                      "ntsRequired": ["riskIndicator"],
+                      "baspiRequired": ["riskIndicator"],
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "ntsRef": "C3.1.1.1",
                           "type": "string",
                           "title": "Is the property impacted?",
@@ -21426,19 +21394,19 @@
                         }
                       },
                       "discriminator": {
-                        "propertyName": "impactIndicator"
+                        "propertyName": "riskIndicator"
                       },
                       "oneOf": [
                         {
                           "properties": {
-                            "impactIndicator": {
+                            "riskIndicator": {
                               "enum": ["No"]
                             }
                           }
                         },
                         {
                           "properties": {
-                            "impactIndicator": {
+                            "riskIndicator": {
                               "enum": ["Yes"]
                             },
                             "actionAlertRating": {
@@ -21446,6 +21414,11 @@
                               "title": "Action alert rating (1 is Green, 5 is Red)",
                               "enum": ["1", "2", "3", "4", "5"]
                             },
+                            "result": {
+                              "title": "Result",
+                              "type": "string",
+                              "minLength": 1
+                            },
                             "summary": {
                               "ntsRef": "C3.1.1.2",
                               "type": "string",
@@ -21473,7 +21446,7 @@
                                     "type": "string",
                                     "title": "Risk sub-category name"
                                   },
-                                  "impactIndicator": {
+                                  "riskIndicator": {
                                     "type": "string",
                                     "title": "Is action recommended?",
                                     "enum": ["Yes", "No"]
@@ -21483,6 +21456,11 @@
                                     "title": "Action alert rating (1 is Green, 5 is Red)",
                                     "enum": ["1", "2", "3", "4", "5"]
                                   },
+                                  "result": {
+                                    "title": "Result",
+                                    "type": "string",
+                                    "minLength": 1
+                                  },
                                   "summary": {
                                     "type": "string",
                                     "title": "Summary of risk",
@@ -21551,7 +21529,7 @@
                           }
                         },
                         "details": {
-                          "ntsRef": "C3.1.1.3",
+                          "ntsRef": "C3.1.1.4",
                           "baspiRef": "A11.1.2.1",
                           "ta6Ref": "7.1.2",
                           "title": "Please state when the flooding occurred and identify the parts that flooded",
@@ -21580,7 +21558,7 @@
                       "type": "object",
                       "title": "Radon risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": ["Yes", "No"]
@@ -21590,6 +21568,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -21615,7 +21598,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -21625,6 +21608,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -21727,7 +21715,7 @@
                       "type": "object",
                       "title": "Contaminated land risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": ["Yes", "No"]
@@ -21737,6 +21725,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -21762,7 +21755,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -21772,6 +21765,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -21803,7 +21801,7 @@
                       "type": "object",
                       "title": "Ground stability risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": ["Yes", "No"]
@@ -21813,6 +21811,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -21838,7 +21841,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -21848,6 +21851,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -21879,7 +21887,7 @@
                       "type": "object",
                       "title": "Energy risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": ["Yes", "No"]
@@ -21889,6 +21897,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -21914,7 +21927,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -21924,6 +21937,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -21955,7 +21973,7 @@
                       "type": "object",
                       "title": "Transportation risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": ["Yes", "No"]
@@ -21965,6 +21983,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -21990,7 +22013,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -22000,6 +22023,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -22031,7 +22059,7 @@
                       "type": "object",
                       "title": "Planning risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": ["Yes", "No"]
@@ -22041,6 +22069,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -22066,7 +22099,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -22076,6 +22109,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -22107,7 +22145,7 @@
                       "type": "object",
                       "title": "Climate risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": ["Yes", "No"]
@@ -22117,6 +22155,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -22142,7 +22185,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -22152,6 +22195,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -22179,9 +22227,9 @@
                   "ntsRef": "C6.1",
                   "title": "Coal mining",
                   "type": "object",
-                  "ntsRequired": ["impactIndicator"],
+                  "ntsRequired": ["riskIndicator"],
                   "properties": {
-                    "impactIndicator": {
+                    "riskIndicator": {
                       "ntsRef": "C6.1.1",
                       "type": "string",
                       "title": "Is the property impacted?",
@@ -22190,19 +22238,19 @@
                     }
                   },
                   "discriminator": {
-                    "propertyName": "impactIndicator"
+                    "propertyName": "riskIndicator"
                   },
                   "oneOf": [
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": ["No"]
                         }
                       }
                     },
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": ["Yes"]
                         },
                         "actionAlertRating": {
@@ -22210,6 +22258,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "ntsRef": "C6.1.1",
                           "type": "string",
@@ -22237,7 +22290,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -22247,6 +22300,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -22274,9 +22332,9 @@
                   "ntsRef": "C6.2",
                   "title": "Non-coal mining",
                   "type": "object",
-                  "ntsRequired": ["impactIndicator"],
+                  "ntsRequired": ["riskIndicator"],
                   "properties": {
-                    "impactIndicator": {
+                    "riskIndicator": {
                       "ntsRef": "C6.2.1",
                       "type": "string",
                       "title": "Is the property impacted?",
@@ -22285,19 +22343,19 @@
                     }
                   },
                   "discriminator": {
-                    "propertyName": "impactIndicator"
+                    "propertyName": "riskIndicator"
                   },
                   "oneOf": [
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": ["No"]
                         }
                       }
                     },
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": ["Yes"]
                         },
                         "actionAlertRating": {
@@ -22305,6 +22363,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "ntsRef": "C6.2.2",
                           "type": "string",
@@ -22332,7 +22395,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -22342,6 +22405,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -22370,9 +22438,9 @@
                   "rdsRef": "Sustainability/Environmental|Natural|Situational",
                   "title": "Coastal erosion",
                   "type": "object",
-                  "ntsRequired": ["impactIndicator"],
+                  "ntsRequired": ["riskIndicator"],
                   "properties": {
-                    "impactIndicator": {
+                    "riskIndicator": {
                       "ntsRef": "C3.2.1",
                       "type": "string",
                       "title": "Is the property impacted?",
@@ -22381,19 +22449,19 @@
                     }
                   },
                   "discriminator": {
-                    "propertyName": "impactIndicator"
+                    "propertyName": "riskIndicator"
                   },
                   "oneOf": [
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": ["No"]
                         }
                       }
                     },
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": ["Yes"]
                         },
                         "actionAlertRating": {
@@ -22401,6 +22469,11 @@
                           "title": "Action alert rating (1 is Green, 5 is Red)",
                           "enum": ["1", "2", "3", "4", "5"]
                         },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "ntsRef": "C3.2.2",
                           "type": "string",
@@ -22428,7 +22501,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": ["Yes", "No"]
@@ -22438,6 +22511,11 @@
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
                                 "enum": ["1", "2", "3", "4", "5"]
                               },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -23681,8 +23759,11 @@
                 "solarPanels": {
                   "baspiRef": "B4.3",
                   "piqRef": "B4.4",
+                  "ta6Ref": "4.6",
                   "title": "Solar or photovoltaic panels",
                   "type": "object",
+                  "baspiRequired": ["hasSolarPanels"],
+                  "ta6Required": ["hasSolarPanels"],
                   "properties": {
                     "hasSolarPanels": {
                       "baspiRef": "B4.3.0",
@@ -23694,8 +23775,6 @@
                       "enum": ["Yes", "No"]
                     }
                   },
-                  "baspiRequired": ["hasSolarPanels"],
-                  "ta6Required": ["hasSolarPanels"],
                   "discriminator": {
                     "propertyName": "hasSolarPanels"
                   },