@pdtf/schemas 2.0.0-9 → 2.0.0

package/src/schemas/v2/overlays/baspi.json

@@ -2,8 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://trust.propdata.org.uk/schemas/v2/overlays/baspi.json",
   "required": [
-    "transactionId",
-    "status",
     "participants",
     "propertyPack"
   ],
@@ -32,8 +30,12 @@
       }
     },
     "propertyPack": {
-      "baspiRef": "-",
+      "baspiRef": "0",
       "title": "Property Pack",
+      "required": [
+        "materialFacts",
+        "additionalLegalInfo"
+      ],
       "properties": {
         "materialFacts": {
           "baspiRef": "A",
@@ -56,7 +58,6 @@
             "fixturesAndFittings",
             "waterAndDrainage",
             "connectedUtilities",
-            "greenDealLoan",
             "centralHeating",
             "insurance",
             "boundaries",
@@ -141,7 +142,7 @@
                         },
                         "details": {
                           "baspiRef": "A1.2.2",
-                          "title": "Provide details and likely timescale for delay (if known)"
+                          "title": "Provide details and likely timescale for delay"
                         },
                         "attachments": {
                           "baspiRef": "A1.2.3",
@@ -266,24 +267,66 @@
                             ],
                             "properties": {
                               "contactDetails": {
+                                "baspiRef": "A1.5.1",
+                                "title": "Contact Details",
+                                "description": "Complete the details for the relevant parties",
+                                "required": [
+                                  "rentchargeOwner",
+                                  "managingAgent"
+                                ],
                                 "properties": {
                                   "rentchargeOwner": {
                                     "baspiRef": "A1.5.4",
                                     "title": "Rentcharge Owner",
+                                    "required": [
+                                      "contact"
+                                    ],
                                     "properties": {
                                       "contact": {
+                                        "baspiRef": "A1.5.4.1",
                                         "required": [
                                           "nameOrOrganisation",
-                                          "line1",
-                                          "postcode",
+                                          "address",
                                           "emailAddress"
                                         ],
                                         "properties": {
+                                          "nameOrOrganisation": {
+                                            "baspiRef": "A1.5.4.1.1",
+                                            "title": "Name or organisation"
+                                          },
                                           "address": {
+                                            "baspiRef": "A1.5.4.1.2",
+                                            "title": "Address",
                                             "required": [
                                               "line1",
                                               "postcode"
-                                            ]
+                                            ],
+                                            "properties": {
+                                              "line1": {
+                                                "baspiRef": "A1.5.4.1.2.1",
+                                                "title": "Address line 1"
+                                              },
+                                              "line2": {
+                                                "baspiRef": "A1.5.4.1.2.2",
+                                                "title": "Address line 2"
+                                              },
+                                              "line3": {
+                                                "baspiRef": "A1.5.4.1.2.3",
+                                                "title": "Address line 3"
+                                              },
+                                              "town": {
+                                                "baspiRef": "A1.5.4.1.2.4",
+                                                "title": "Town"
+                                              },
+                                              "postcode": {
+                                                "baspiRef": "A1.5.4.1.2.5",
+                                                "title": "Postcode"
+                                              }
+                                            }
+                                          },
+                                          "emailAddress": {
+                                            "baspiRef": "A1.5.5.1.3",
+                                            "title": "Email address"
                                           }
                                         }
                                       }
@@ -292,13 +335,14 @@
                                   "managingAgent": {
                                     "baspiRef": "A1.5.5",
                                     "title": "Managing Agent",
+                                    "required": [
+                                      "contact"
+                                    ],
                                     "properties": {
                                       "contact": {
                                         "baspiRef": "A1.5.5.1",
                                         "required": [
                                           "nameOrOrganisation",
-                                          "line1",
-                                          "postcode",
                                           "telephone",
                                           "emailAddress"
                                         ],
@@ -346,6 +390,154 @@
                                     }
                                   }
                                 }
+                              },
+                              "transferAndRegistration": {
+                                "properties": {
+                                  "requirementsToBeMemberOfManagementCompany": {
+                                    "baspiRef": "A1.5.6",
+                                    "title": "Is the incoming Owner required to take a share in, or become a member of, the Management Company?",
+                                    "discriminator": {
+                                      "propertyName": "yesNo"
+                                    },
+                                    "oneOf": [
+                                      {
+                                        "properties": {
+                                          "yesNo": {
+                                            "enum": [
+                                              "No"
+                                            ]
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "properties": {
+                                          "yesNo": {
+                                            "enum": [
+                                              "Yes"
+                                            ]
+                                          }
+                                        }
+                                      }
+                                    ],
+                                    "required": [
+                                      "yesNo"
+                                    ],
+                                    "properties": {
+                                      "yesNo": {
+                                        "baspiRef": "A1.5.6.1",
+                                        "enum": [
+                                          "Yes",
+                                          "No"
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              "serviceCharge": {
+                                "baspiRef": "A1.5.1",
+                                "title": "Service Charge",
+                                "required": [
+                                  "annualServiceCharge",
+                                  "largeAdditionalExpense",
+                                  "reserveFund"
+                                ],
+                                "properties": {
+                                  "annualServiceCharge": {
+                                    "baspiRef": "A1.5.1.1.2",
+                                    "title": "What is the annual Service Charge payable by this Property?",
+                                    "description": "This should include any sums payable for the maintenance of the managed area"
+                                  },
+                                  "largeAdditionalExpense": {
+                                    "baspiRef": "A1.5.2.1",
+                                    "title": "Does the seller know of any expense (e.g. the cost of redecoration of outside or communal areas not usually incurred annually) likely to be shown in the service charge accounts within the next three years?",
+                                    "discriminator": {
+                                      "propertyName": "yesNo"
+                                    },
+                                    "oneOf": [
+                                      {
+                                        "properties": {
+                                          "yesNo": {
+                                            "enum": [
+                                              "No"
+                                            ]
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "properties": {
+                                          "yesNo": {
+                                            "enum": [
+                                              "Yes"
+                                            ]
+                                          },
+                                          "details": {
+                                            "baspiRef": "A1.5.2.3",
+                                            "title": "Details"
+                                          }
+                                        },
+                                        "required": [
+                                          "details"
+                                        ]
+                                      }
+                                    ],
+                                    "required": [
+                                      "yesNo"
+                                    ],
+                                    "properties": {
+                                      "yesNo": {
+                                        "baspiRef": "A1.5.2.2",
+                                        "enum": [
+                                          "Yes",
+                                          "No"
+                                        ]
+                                      }
+                                    }
+                                  },
+                                  "transferFees": {
+                                    "baspiRef": "A1.5.3",
+                                    "title": "Are there any transfer fees, deferred charges or similar fees, expressed as a percentage of the Property's value payable on an event such as resale or subletting?",
+                                    "discriminator": {
+                                      "propertyName": "yesNo"
+                                    },
+                                    "oneOf": [
+                                      {
+                                        "properties": {
+                                          "yesNo": {
+                                            "enum": [
+                                              "No"
+                                            ]
+                                          }
+                                        }
+                                      },
+                                      {
+                                        "properties": {
+                                          "yesNo": {
+                                            "enum": [
+                                              "Yes"
+                                            ]
+                                          },
+                                          "details": {
+                                            "baspiRef": "A1.5.3.2",
+                                            "title": "Provide details."
+                                          }
+                                        }
+                                      }
+                                    ],
+                                    "required": [
+                                      "yesNo"
+                                    ],
+                                    "properties": {
+                                      "yesNo": {
+                                        "baspiRef": "A1.5.3.1",
+                                        "enum": [
+                                          "Yes",
+                                          "No"
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
                               }
                             }
                           }
@@ -475,13 +667,16 @@
                                         "title": "Landlord",
                                         "description": "The landlord (or freeholder) may be, for example, a private individual, a housing association, or a management company owned by the residents",
                                         "required": [
-                                          "nameOrOrganisation",
-                                          "address",
-                                          "emailAddress"
+                                          "contact"
                                         ],
                                         "properties": {
                                           "contact": {
                                             "baspiRef": "A1.5.4.1",
+                                            "required": [
+                                              "nameOrOrganisation",
+                                              "address",
+                                              "emailAddress"
+                                            ],
                                             "properties": {
                                               "nameOrOrganisation": {
                                                 "baspiRef": "A1.5.4.1.1",
@@ -529,6 +724,9 @@
                                         "baspiRef": "A1.5.5",
                                         "title": "Managing Agent",
                                         "description": "A managing agent may be employed by the landlord or by the tenants’ management company to collect the rent and/or manage the building.",
+                                        "required": [
+                                          "contact"
+                                        ],
                                         "properties": {
                                           "contact": {
                                             "baspiRef": "A1.5.5.1",
@@ -614,7 +812,7 @@
                                           "yesNoNotApplicable": {
                                             "enum": [
                                               "No",
-                                              "N/A"
+                                              "Not applicable"
                                             ]
                                           }
                                         }
@@ -638,7 +836,7 @@
                                         "enum": [
                                           "Yes",
                                           "No",
-                                          "N/A"
+                                          "Not applicable"
                                         ]
                                       }
                                     }
@@ -670,7 +868,7 @@
                                       },
                                       "annualGroundRent": {
                                         "baspiRef": "A1.4.2.2",
-                                        "title": "What is the annual ground rent payable?"
+                                        "title": "What is the annual ground rent payable? (£)"
                                       },
                                       "rentSubjectToIncrease": {
                                         "baspiRef": "A1.4.2.3",
@@ -702,7 +900,7 @@
                                               "rentIncreaseCalculated": {
                                                 "baspiRef": "A1.4.2.3.3",
                                                 "title": "How is the increase calculated?",
-                                                "description": "eg set figure, doubling, in line with Retail Price Index, Consumer Price Index, etc"
+                                                "description": "e.g. set figure, doubling, in line with Retail Price Index, Consumer Price Index, etc"
                                               }
                                             },
                                             "required": [
@@ -856,6 +1054,49 @@
                                             ]
                                           }
                                         }
+                                      },
+                                      "transferFees": {
+                                        "baspiRef": "A1.5.3",
+                                        "title": "Are there any transfer fees deferred service charges or similar fees, expressed as a percentage of the Property's value, payable on an event such as resale or subletting?",
+                                        "discriminator": {
+                                          "propertyName": "yesNo"
+                                        },
+                                        "oneOf": [
+                                          {
+                                            "properties": {
+                                              "yesNo": {
+                                                "enum": [
+                                                  "No"
+                                                ]
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "properties": {
+                                              "yesNo": {
+                                                "enum": [
+                                                  "Yes"
+                                                ]
+                                              },
+                                              "details": {
+                                                "baspiRef": "A1.5.3.2",
+                                                "title": "Provide details."
+                                              }
+                                            }
+                                          }
+                                        ],
+                                        "required": [
+                                          "yesNo"
+                                        ],
+                                        "properties": {
+                                          "yesNo": {
+                                            "baspiRef": "A1.5.3.1",
+                                            "enum": [
+                                              "Yes",
+                                              "No"
+                                            ]
+                                          }
+                                        }
                                       }
                                     },
                                     "required": [
@@ -1009,7 +1250,8 @@
                       "baspiRef": "A1.6.2.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -1052,7 +1294,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -1091,7 +1334,8 @@
                       "baspiRef": "A1.7.1.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -1107,7 +1351,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -1146,7 +1391,8 @@
                       "baspiRef": "A1.7.2.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -1162,7 +1408,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -1174,12 +1421,8 @@
                             "Yes"
                           ]
                         },
-                        "details": {
-                          "baspiRef": "A1.7.3.2",
-                          "title": "Details"
-                        },
                         "workCarriedOut": {
-                          "baspiRef": "A1.7.3.3",
+                          "baspiRef": "A1.7.3.2",
                           "title": "Has work been carried out to any trees which are protected by the order?",
                           "discriminator": {
                             "propertyName": "yesNo"
@@ -1201,17 +1444,18 @@
                                     "Yes"
                                   ]
                                 },
-                                "details": {
-                                  "baspiRef": "A1.7.3.2.2",
-                                  "title": "Were the relevant consents obtained? Provide any relevant documentation",
+                                "consentsObtained": {
+                                  "baspiRef": "A1.7.3.3",
+                                  "title": "Were the relevant consents obtained?",
                                   "enum": [
                                     "Yes",
-                                    "No"
+                                    "No",
+                                    "Not known"
                                   ]
                                 },
                                 "attachments": {
                                   "baspiRef": "A1.7.3.4",
-                                  "title": "Attachments",
+                                  "title": "Provide any relevant documentation",
                                   "enum": [
                                     "Attached",
                                     "To follow"
@@ -1219,7 +1463,7 @@
                                 }
                               },
                               "required": [
-                                "details"
+                                "consentsObtained"
                               ]
                             }
                           ],
@@ -1236,7 +1480,10 @@
                             }
                           }
                         }
-                      }
+                      },
+                      "required": [
+                        "workCarriedOut"
+                      ]
                     }
                   ],
                   "required": [
@@ -1247,7 +1494,8 @@
                       "baspiRef": "A1.7.3.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -1426,7 +1674,8 @@
               "baspiRef": "A1.8.3",
               "title": "Energy Efficiency",
               "required": [
-                "certificate"
+                "certificate",
+                "greenDealLoan"
               ],
               "properties": {
                 "certificate": {
@@ -1453,36 +1702,100 @@
                       ]
                     }
                   }
-                }
-              }
-            },
-            "councilTax": {
-              "baspiRef": "A1.9",
-              "title": "Council Tax",
-              "required": [
-                "councilTaxBand",
-                "councilTaxAffectingAlterations"
-              ],
-              "properties": {
-                "councilTaxBand": {
-                  "baspiRef": "A1.9.1",
-                  "title": "Which Council Tax band does this property fall within?",
-                  "description": "Band I relates to Wales only",
-                  "enum": [
-                    "A",
-                    "B",
-                    "C",
-                    "D",
-                    "E",
-                    "F",
-                    "G",
-                    "H",
-                    "I"
-                  ]
                 },
-                "councilTaxAffectingAlterations": {
-                  "baspiRef": "A1.9.2",
-                  "title": "Have you altered the property in any way to the extent that it might change the Council Tax band e.g. added a bedroom or substantially extended the property?",
+                "greenDealLoan": {
+                  "baspiRef": "A7.3",
+                  "title": "Green Deal Loan",
+                  "required": [
+                    "hasGreenDealLoan"
+                  ],
+                  "properties": {
+                    "hasGreenDealLoan": {
+                      "baspiRef": "A7.3",
+                      "title": "Is this property subject to a Green Deal loan or other financed home improvement scheme?",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "details": {
+                              "baspiRef": "A7.3.2",
+                              "title": "Please provide details below including any outstanding payments for the renewable devices and any feed-in tariffs and a copy of your last electricity bill"
+                            },
+                            "attachments": {
+                              "baspiRef": "A7.3.3",
+                              "title": "Attachments",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "details",
+                            "attachments"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "baspiRef": "A7.3.1",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "councilTax": {
+              "baspiRef": "A1.9",
+              "title": "Council Tax",
+              "required": [
+                "councilTaxBand",
+                "councilTaxAffectingAlterations"
+              ],
+              "properties": {
+                "councilTaxBand": {
+                  "baspiRef": "A1.9.1",
+                  "title": "Which Council Tax band does this property fall within?",
+                  "description": "Band I relates to Wales only",
+                  "enum": [
+                    "A",
+                    "B",
+                    "C",
+                    "D",
+                    "E",
+                    "F",
+                    "G",
+                    "H",
+                    "I"
+                  ]
+                },
+                "councilTaxAffectingAlterations": {
+                  "baspiRef": "A1.9.2",
+                  "title": "Have you altered the property in any way to the extent that it might change the Council Tax band e.g. added a bedroom or substantially extended the property?",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -1540,7 +1853,8 @@
               "baspiRef": "A2",
               "title": "Disputes and Complaints",
               "required": [
-                "hasDisputesAndComplaints"
+                "hasDisputesAndComplaints",
+                "leadingToDisputesAndComplaints"
               ],
               "properties": {
                 "hasDisputesAndComplaints": {
@@ -1647,6 +1961,7 @@
                 "changeOfUse",
                 "windowReplacementsSince2002",
                 "hasAddedConservatory",
+                "worksUnfinished",
                 "planningPermissionBreaches",
                 "unresolvedPlanningIssues"
               ],
@@ -1941,7 +2256,7 @@
                 },
                 "changeOfUse": {
                   "baspiRef": "A3.2",
-                  "title": "Has there been any change of use (e.g. from an office to a residence?",
+                  "title": "Has there been any change of use (e.g. from an office to a residence)?",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -2061,7 +2376,8 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "No"
+                                    "No",
+                                    "Not required"
                                   ]
                                 },
                                 "details": {
@@ -2897,7 +3213,7 @@
                         },
                         "details": {
                           "baspiRef": "A3.7.2",
-                          "title": "Details"
+                          "title": "Please give details"
                         },
                         "willingToInsure": {
                           "baspiRef": "A3.9",
@@ -2961,7 +3277,7 @@
                         },
                         "details": {
                           "baspiRef": "A3.8.2",
-                          "title": "Details"
+                          "title": "Please give details"
                         },
                         "willingToInsure": {
                           "baspiRef": "A3.9",
@@ -3535,7 +3851,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -3547,13 +3864,18 @@
                             "Yes"
                           ]
                         },
-                        "details": {
+                        "managementPlanInPlace": {
                           "baspiRef": "A5.3.2",
-                          "title": "Please provide details,state whether there is a management plan in place and attach a copy"
+                          "title": "Is there a Japanese Knotweed management and treatment plan in place?",
+                          "enum": [
+                            "Yes",
+                            "No",
+                            "Not known"
+                          ]
                         },
                         "attachments": {
                           "baspiRef": "A5.3.3",
-                          "title": "Attachments",
+                          "title": "Please supply a copy with any insurance cover linked to the plan",
                           "enum": [
                             "Attached",
                             "To follow"
@@ -3561,8 +3883,7 @@
                         }
                       },
                       "required": [
-                        "details",
-                        "attachments"
+                        "managementPlanInPlace"
                       ]
                     }
                   ],
@@ -3574,7 +3895,8 @@
                       "baspiRef": "A5.3.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -3807,7 +4129,8 @@
                 "cableSatelliteTV",
                 "broadband",
                 "solarPanels",
-                "otherServices"
+                "otherServices",
+                "maintenanceAgreements"
               ],
               "properties": {
                 "mainsElectricity": {
@@ -3835,7 +4158,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.1.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -3852,7 +4175,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.1.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -3899,7 +4222,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.2.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -3916,7 +4239,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.2.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -3963,7 +4286,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.3.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -3980,7 +4303,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.3.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -4027,7 +4350,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.4.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -4044,7 +4367,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.4.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -4091,7 +4414,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.5.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -4108,7 +4431,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.5.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -4155,7 +4478,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.6.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -4172,7 +4495,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.6.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -4219,7 +4542,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.7.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -4236,7 +4559,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.7.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -4283,7 +4606,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.8.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -4300,7 +4623,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.8.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -4348,7 +4671,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.9.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       }
                     },
@@ -4365,7 +4688,7 @@
                         },
                         "supplier": {
                           "baspiRef": "A7.1.0.9.2",
-                          "title": "Supplier (if known)"
+                          "title": "Supplier"
                         }
                       },
                       "required": [
@@ -4445,516 +4768,815 @@
               }
             },
             "waterAndDrainage": {
-              "baspiRef": "A7",
+              "baspiRef": "A7.1.0",
               "title": "Water and Drainage",
               "description": "Please describe the water and drainage services that are connected to the property.",
               "required": [
-                "mainsWater",
-                "mainsSurfaceWaterDrainage",
-                "mainsFoulDrainage"
+                "water",
+                "drainage",
+                "maintenanceAgreements"
               ],
               "properties": {
-                "mainsWater": {
+                "water": {
                   "baspiRef": "A7.1.0.10",
-                  "title": "Mains water",
-                  "discriminator": {
-                    "propertyName": "yesNo"
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
+                  "title": "Water",
+                  "required": [
+                    "mainsWater"
+                  ],
+                  "properties": {
+                    "mainsWater": {
+                      "baspiRef": "A7.1.0.10.0",
+                      "title": "Mains water",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "supplier": {
+                              "baspiRef": "A7.1.0.10.2",
+                              "title": "Supplier"
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "To be connected"
+                              ]
+                            },
+                            "dateToBeConnected": {
+                              "baspiRef": "A7.1.0.10.3",
+                              "title": "Date to be connected"
+                            },
+                            "supplier": {
+                              "baspiRef": "A7.1.0.10.2",
+                              "title": "Supplier"
+                            }
+                          },
+                          "required": [
+                            "dateToBeConnected"
                           ]
                         }
-                      }
-                    },
-                    {
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
                       "properties": {
                         "yesNo": {
+                          "baspiRef": "A7.1.0.10.1",
                           "enum": [
-                            "Yes"
+                            "Yes",
+                            "To be connected",
+                            "No"
                           ]
-                        },
-                        "supplier": {
-                          "baspiRef": "A7.1.0.10.2",
-                          "title": "Supplier (if known)"
                         }
                       }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "baspiRef": "A7.1.0.10.3",
-                          "title": "Date to be connected"
-                        },
-                        "supplier": {
-                          "baspiRef": "A7.1.0.10.2",
-                          "title": "Supplier (if known)"
-                        }
-                      },
-                      "required": [
-                        "dateToBeConnected"
-                      ]
-                    }
-                  ],
-                  "required": [
-                    "yesNo"
-                  ],
-                  "properties": {
-                    "yesNo": {
-                      "baspiRef": "A7.1.0.10.1",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
                     }
                   }
                 },
-                "mainsSurfaceWaterDrainage": {
+                "drainage": {
                   "baspiRef": "A7.1.0.12",
-                  "title": "Mains surface water drainage",
-                  "discriminator": {
-                    "propertyName": "yesNo"
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
+                  "title": "Drainage",
+                  "required": [
+                    "mainsSurfaceWaterDrainage",
+                    "mainsFoulDrainage"
+                  ],
+                  "properties": {
+                    "mainsSurfaceWaterDrainage": {
+                      "baspiRef": "A7.1.0.12.0",
+                      "title": "Mains surface water drainage",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No",
+                                "Not known"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "supplier": {
+                              "baspiRef": "A7.1.0.12.2",
+                              "title": "Supplier"
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "To be connected"
+                              ]
+                            },
+                            "dateToBeConnected": {
+                              "baspiRef": "A7.1.0.12.3",
+                              "title": "Date to be connected"
+                            },
+                            "supplier": {
+                              "baspiRef": "A7.1.0.12.2",
+                              "title": "Supplier"
+                            }
+                          },
+                          "required": [
+                            "dateToBeConnected"
                           ]
                         }
-                      }
-                    },
-                    {
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
                       "properties": {
                         "yesNo": {
+                          "baspiRef": "A7.1.0.12.1",
                           "enum": [
-                            "Yes"
+                            "Yes",
+                            "To be connected",
+                            "No",
+                            "Not known"
                           ]
-                        },
-                        "supplier": {
-                          "baspiRef": "A7.1.0.12.2",
-                          "title": "Supplier (if known)"
                         }
                       }
                     },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "baspiRef": "A7.1.0.12.3",
-                          "title": "Date to be connected"
-                        },
-                        "supplier": {
-                          "baspiRef": "A7.1.0.12.2",
-                          "title": "Supplier (if known)"
-                        }
+                    "mainsFoulDrainage": {
+                      "baspiRef": "A7.1.0.11",
+                      "title": "Mains foul drainage",
+                      "discriminator": {
+                        "propertyName": "yesNo"
                       },
-                      "required": [
-                        "dateToBeConnected"
-                      ]
-                    }
-                  ],
-                  "required": [
-                    "yesNo"
-                  ],
-                  "properties": {
-                    "yesNo": {
-                      "baspiRef": "A7.1.0.12.1",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                "mainsFoulDrainage": {
-                  "baspiRef": "A7.1.0.11",
-                  "title": "Mains foul drainage",
-                  "discriminator": {
-                    "propertyName": "yesNo"
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "supplier": {
-                          "baspiRef": "A7.1.0.11.3",
-                          "title": "Supplier (if known)"
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "baspiRef": "A7.1.0.11.2",
-                          "title": "Date to be connected"
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "supplier": {
+                              "baspiRef": "A7.1.0.11.3",
+                              "title": "Supplier"
+                            }
+                          }
                         },
-                        "supplier": {
-                          "baspiRef": "A7.1.0.11.2",
-                          "title": "Supplier (if known)"
-                        }
-                      },
-                      "required": [
-                        "dateToBeConnected"
-                      ]
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "To be connected"
+                              ]
+                            },
+                            "dateToBeConnected": {
+                              "baspiRef": "A7.1.0.11.2",
+                              "title": "Date to be connected"
+                            },
+                            "supplier": {
+                              "baspiRef": "A7.1.0.11.3",
+                              "title": "Supplier"
+                            }
+                          },
+                          "required": [
+                            "dateToBeConnected"
                           ]
                         },
-                        "sustainableDrainageSystem": {
-                          "baspiRef": "A7.1.0.13",
-                          "title": "Sustainable Drainage System",
-                          "discriminator": {
-                            "propertyName": "yesNo"
-                          },
-                          "oneOf": [
-                            {
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No",
+                                "Not known"
+                              ]
+                            },
+                            "sustainableDrainageSystem": {
+                              "baspiRef": "A7.1.0.13",
+                              "title": "Sustainable Drainage System",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "supplier": {
+                                      "baspiRef": "A7.1.0.13.3",
+                                      "title": "Supplier"
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "To be connected"
+                                      ]
+                                    },
+                                    "dateToBeConnected": {
+                                      "baspiRef": "A7.1.0.13.2",
+                                      "title": "Date to be connected"
+                                    },
+                                    "supplier": {
+                                      "baspiRef": "A7.1.0.13.3",
+                                      "title": "Supplier"
+                                    }
+                                  },
+                                  "required": [
+                                    "dateToBeConnected"
+                                  ]
+                                }
+                              ],
+                              "required": [
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "A7.1.0.13.1",
                                   "enum": [
+                                    "Yes",
+                                    "To be connected",
                                     "No"
                                   ]
                                 }
                               }
                             },
-                            {
+                            "septicTank": {
+                              "baspiRef": "A7.1.0.14",
+                              "title": "Septic tank",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "dateReplaced": {
+                                      "baspiRef": "A7.1.0.14.2",
+                                      "title": "Date replaced or upgraded"
+                                    },
+                                    "dateLastEmptied": {
+                                      "baspiRef": "A7.1.0.14.3",
+                                      "title": "Date last emptied"
+                                    }
+                                  },
+                                  "required": [
+                                    "dateReplaced",
+                                    "dateLastEmptied"
+                                  ]
+                                }
+                              ],
+                              "required": [
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "A7.1.0.14.1",
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "No"
                                   ]
-                                },
-                                "supplier": {
-                                  "baspiRef": "A7.1.0.13.3",
-                                  "title": "Supplier (if known)"
                                 }
                               }
                             },
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "To be connected"
-                                  ]
-                                },
-                                "dateToBeConnected": {
-                                  "baspiRef": "A7.1.0.13.2",
-                                  "title": "Date to be connected"
+                            "cesspit": {
+                              "baspiRef": "A7.1.0.15",
+                              "title": "Cesspit",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
                                 },
-                                "supplier": {
-                                  "baspiRef": "A7.1.0.13.3",
-                                  "title": "Supplier (if known)"
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "dateLastEmptied": {
+                                      "baspiRef": "A7.1.0.15.2",
+                                      "title": "Date last emptied"
+                                    }
+                                  },
+                                  "required": [
+                                    "dateLastEmptied"
+                                  ]
                                 }
-                              },
+                              ],
                               "required": [
-                                "dateToBeConnected"
-                              ]
-                            }
-                          ],
-                          "required": [
-                            "yesNo"
-                          ],
-                          "properties": {
-                            "yesNo": {
-                              "baspiRef": "A7.1.0.13.1",
-                              "enum": [
-                                "Yes",
-                                "To be connected",
-                                "No"
-                              ]
-                            }
-                          }
-                        },
-                        "septicTank": {
-                          "baspiRef": "A7.1.0.14",
-                          "title": "Septic tank",
-                          "discriminator": {
-                            "propertyName": "yesNo"
-                          },
-                          "oneOf": [
-                            {
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "A7.1.0.15.1",
                                   "enum": [
+                                    "Yes",
                                     "No"
                                   ]
                                 }
                               }
                             },
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "Yes"
-                                  ]
-                                },
-                                "dateReplaced": {
-                                  "baspiRef": "A7.1.0.14.2",
-                                  "title": "Date replaced or upgraded"
+                            "sewerageTreatmentPlant": {
+                              "baspiRef": "A7.1.0.16",
+                              "title": "Sewerage treatment plant",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
                                 },
-                                "dateLastEmptied": {
-                                  "baspiRef": "A7.1.0.14.3",
-                                  "title": "Date last emptied"
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "dateInstalled": {
+                                      "baspiRef": "A7.1.0.16.2",
+                                      "title": "Date installed"
+                                    },
+                                    "dateLastServiced": {
+                                      "baspiRef": "A7.1.0.16.3",
+                                      "title": "Date last serviced"
+                                    },
+                                    "attachments": {
+                                      "baspiRef": "A7.1.0.16.3",
+                                      "title": "If installed after Jan 1991 supply the Building Regulations approval or equivalent",
+                                      "enum": [
+                                        "Attached",
+                                        "To follow",
+                                        "Not applicable"
+                                      ]
+                                    }
+                                  },
+                                  "required": [
+                                    "dateInstalled",
+                                    "dateLastServiced",
+                                    "attachments"
+                                  ]
                                 }
-                              },
+                              ],
                               "required": [
-                                "dateReplaced",
-                                "dateLastEmptied"
-                              ]
-                            }
-                          ],
-                          "required": [
-                            "yesNo"
-                          ],
-                          "properties": {
-                            "yesNo": {
-                              "baspiRef": "A7.1.0.14.1",
-                              "enum": [
-                                "Yes",
-                                "No"
-                              ]
-                            }
-                          }
-                        },
-                        "cesspit": {
-                          "baspiRef": "A7.1.0.15",
-                          "title": "Cesspit",
-                          "discriminator": {
-                            "propertyName": "yesNo"
-                          },
-                          "oneOf": [
-                            {
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "A7.1.0.16.1",
                                   "enum": [
+                                    "Yes",
                                     "No"
                                   ]
                                 }
                               }
                             },
-                            {
+                            "otherConnectedProperties": {
+                              "baspiRef": "A7.1.1",
+                              "title": "Do other properties connect to the septic tank, cesspit or sewerage treatment plant?",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "numberOfPropertiesSharing": {
+                                      "baspiRef": "A7.1.1.1",
+                                      "title": "How many other properties?"
+                                    },
+                                    "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"
+                                    }
+                                  },
+                                  "required": [
+                                    "numberOfPropertiesSharing",
+                                    "details"
+                                  ]
+                                }
+                              ],
+                              "required": [
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "A7.1.1.1",
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "No"
                                   ]
-                                },
-                                "dateLastEmptied": {
-                                  "baspiRef": "A7.1.0.15.2",
-                                  "title": "Date last emptied"
                                 }
+                              }
+                            },
+                            "plantOnOtherLand": {
+                              "baspiRef": "A7.1.2",
+                              "title": "Is any part of the septic tank, cesspit or sewerage treatment plant located on someone else’s land?",
+                              "discriminator": {
+                                "propertyName": "yesNo"
                               },
-                              "required": [
-                                "dateLastEmptied"
-                              ]
-                            }
-                          ],
-                          "required": [
-                            "yesNo"
-                          ],
-                          "properties": {
-                            "yesNo": {
-                              "baspiRef": "A7.1.0.15.1",
-                              "enum": [
-                                "Yes",
-                                "No"
-                              ]
-                            }
-                          }
-                        },
-                        "sewerageTreatmentPlant": {
-                          "baspiRef": "A7.1.0.16",
-                          "title": "Sewerage treatment plant",
-                          "discriminator": {
-                            "propertyName": "yesNo"
-                          },
-                          "oneOf": [
-                            {
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "attachments": {
+                                      "baspiRef": "7.1.2.2",
+                                      "title": "Please supply a plan showing the location of the system and how access is obtained.",
+                                      "enum": [
+                                        "Attached",
+                                        "To follow"
+                                      ]
+                                    }
+                                  },
+                                  "required": [
+                                    "attachments"
+                                  ]
+                                }
+                              ],
+                              "required": [
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "7.1.2.1",
                                   "enum": [
+                                    "Yes",
                                     "No"
                                   ]
                                 }
                               }
                             },
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "Yes"
-                                  ]
-                                },
-                                "dateInstalled": {
-                                  "baspiRef": "A7.1.0.16.2",
-                                  "title": "Date installed"
-                                },
-                                "dateLastServiced": {
-                                  "baspiRef": "A7.1.0.16.3",
-                                  "title": "Date last serviced"
+                            "plantRegistered": {
+                              "baspiRef": "A7.1.3",
+                              "title": "Is the septic tank, cesspit or sewerage treatment plant registered with the Environment Agency or exempted?",
+                              "discriminator": {
+                                "propertyName": "yesNo"
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
                                 },
-                                "attachments": {
-                                  "baspiRef": "A7.1.0.16.3",
-                                  "title": "If installed after Jan 1991 supply the Building Regulations approval or equivalent",
-                                  "enum": [
-                                    "Attached",
-                                    "To follow",
-                                    "N/A"
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "attachments": {
+                                      "baspiRef": "A7.1.3.2",
+                                      "title": "Please supply the appropriate permit to discharge or exemption certificate",
+                                      "enum": [
+                                        "Attached",
+                                        "To follow"
+                                      ]
+                                    }
+                                  },
+                                  "required": [
+                                    "attachments"
                                   ]
                                 }
-                              },
+                              ],
                               "required": [
-                                "dateInstalled",
-                                "dateLastServiced",
-                                "attachments"
-                              ]
-                            }
-                          ],
-                          "required": [
-                            "yesNo"
-                          ],
-                          "properties": {
-                            "yesNo": {
-                              "baspiRef": "A7.1.0.16.1",
-                              "enum": [
-                                "Yes",
-                                "No"
-                              ]
-                            }
-                          }
-                        },
-                        "otherConnectedProperties": {
-                          "baspiRef": "A7.1.1",
-                          "title": "Do other properties connect to the septic tank, cesspit or sewerage treatment plant?",
-                          "discriminator": {
-                            "propertyName": "yesNo"
-                          },
-                          "oneOf": [
-                            {
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "A7.1.3.1",
                                   "enum": [
+                                    "Yes",
                                     "No"
                                   ]
                                 }
                               }
                             },
-                            {
+                            "plantDrainsIntoWaterway": {
+                              "baspiRef": "A7.1.4",
+                              "title": "Does the septic tank, cesspit or sewerage treatment plant drain into a waterway (lake, river, stream etc)",
+                              "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",
+                                      "title": "Does it comply with the General Binding Rules for discharge into a waterway?",
+                                      "enum": [
+                                        "Yes",
+                                        "No, it does not comply with the rules for discharge into a waterway."
+                                      ]
+                                    }
+                                  },
+                                  "required": [
+                                    "dischargeCompliesWithGBR"
+                                  ]
+                                }
+                              ],
+                              "required": [
+                                "yesNo"
+                              ],
                               "properties": {
                                 "yesNo": {
+                                  "baspiRef": "A7.1.4.1",
                                   "enum": [
-                                    "Yes"
+                                    "Yes",
+                                    "No, the effluent is discharged through a soakaway system."
                                   ]
-                                },
-                                "numberOfPropertiesSharing": {
-                                  "baspiRef": "A7.1.1.1",
-                                  "title": "How many other properties?"
-                                },
-                                "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"
                                 }
-                              },
-                              "required": [
-                                "details",
-                                "attachments"
-                              ]
+                              }
                             }
-                          ],
+                          },
                           "required": [
-                            "yesNo"
-                          ],
-                          "properties": {
-                            "yesNo": {
-                              "baspiRef": "A7.1.1.1",
-                              "enum": [
-                                "Yes",
-                                "No"
-                              ]
-                            }
-                          }
+                            "sustainableDrainageSystem",
+                            "septicTank",
+                            "cesspit",
+                            "sewerageTreatmentPlant",
+                            "otherConnectedProperties",
+                            "plantOnOtherLand",
+                            "plantRegistered",
+                            "plantDrainsIntoWaterway"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "baspiRef": "A7.1.0.11.1",
+                          "enum": [
+                            "Yes",
+                            "To be connected",
+                            "No",
+                            "Not known"
+                          ]
+                        }
+                      }
+                    }
+                  }
+                },
+                "maintenanceAgreements": {
+                  "baspiRef": "A7.2",
+                  "title": "Do you have any licences, maintenance agreements, contracts or service agreements in relation to these services?",
+                  "discriminator": {
+                    "propertyName": "yesNo"
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
+                          ]
+                        },
+                        "details": {
+                          "baspiRef": "A7.2.2",
+                          "title": "Details"
                         },
-                        "plantOnOtherLand": {
-                          "baspiRef": "A7.1.2",
-                          "title": "Is any part of the septic tank, cesspit or sewerage treatment plant located on someone else’s land?",
+                        "attachments": {
+                          "baspiRef": "A7.2.3",
+                          "title": "Attachments",
+                          "enum": [
+                            "Attached",
+                            "To follow"
+                          ]
+                        }
+                      },
+                      "required": [
+                        "details",
+                        "attachments"
+                      ]
+                    }
+                  ],
+                  "required": [
+                    "yesNo"
+                  ],
+                  "properties": {
+                    "yesNo": {
+                      "baspiRef": "A7.2.1",
+                      "enum": [
+                        "Yes",
+                        "No"
+                      ]
+                    }
+                  }
+                }
+              }
+            },
+            "centralHeating": {
+              "baspiRef": "A7.4",
+              "title": "Central Heating",
+              "discriminator": {
+                "propertyName": "hasCentralHeating"
+              },
+              "oneOf": [
+                {
+                  "properties": {
+                    "hasCentralHeating": {
+                      "enum": [
+                        "No"
+                      ]
+                    }
+                  }
+                },
+                {
+                  "properties": {
+                    "hasCentralHeating": {
+                      "enum": [
+                        "Yes"
+                      ]
+                    },
+                    "centralHeatingDetails": {
+                      "baspiRef": "A7.4.0.0",
+                      "title": "Central Heating Details",
+                      "required": [
+                        "centralHeatingFuel",
+                        "centralHeatingInstalled",
+                        "boilerInstallationCertificate",
+                        "heatingLastServicedDate",
+                        "heatingLastServicedReport",
+                        "heatingInGoodWorkingOrder"
+                      ],
+                      "properties": {
+                        "centralHeatingFuel": {
+                          "baspiRef": "A7.4.0.1",
+                          "title": "Central Heating Fuel",
                           "discriminator": {
-                            "propertyName": "yesNo"
+                            "propertyName": "centralHeatingFuelType"
                           },
                           "oneOf": [
                             {
                               "properties": {
-                                "yesNo": {
+                                "centralHeatingFuelType": {
                                   "enum": [
-                                    "No"
+                                    "Gas",
+                                    "Electricity",
+                                    "Oil",
+                                    "LPG"
                                   ]
                                 }
                               }
                             },
                             {
                               "properties": {
-                                "yesNo": {
+                                "centralHeatingFuelType": {
                                   "enum": [
-                                    "Yes"
+                                    "Other"
                                   ]
                                 },
-                                "attachments": {
-                                  "baspiRef": "7.1.2.2",
-                                  "title": "Please supply a plan showing the location of the system and how access is obtained.",
-                                  "enum": [
-                                    "Attached",
-                                    "To follow"
-                                  ]
+                                "otherCentralHeatingFuelType": {
+                                  "baspiRef": "A7.4.0.3",
+                                  "title": "Please describe the other fuel type"
                                 }
                               },
                               "required": [
-                                "attachments"
+                                "otherCentralHeatingFuelType"
                               ]
                             }
                           ],
                           "required": [
-                            "yesNo"
+                            "centralHeatingFuelType"
                           ],
                           "properties": {
-                            "yesNo": {
-                              "baspiRef": "7.1.2.1",
+                            "centralHeatingFuelType": {
+                              "baspiRef": "A7.4.0.2",
+                              "title": "What type of fuel does the system run on?",
                               "enum": [
-                                "Yes",
-                                "No"
+                                "Gas",
+                                "Electricity",
+                                "Oil",
+                                "LPG",
+                                "Other"
                               ]
                             }
                           }
                         },
-                        "plantRegistered": {
-                          "baspiRef": "A7.1.3",
-                          "title": "Is the septic tank, cesspit or sewerage treatment plant registered with the Environment Agency or exempted?",
+                        "centralHeatingInstalled": {
+                          "baspiRef": "A7.4.1",
+                          "title": "When was the heating system installed?"
+                        },
+                        "boilerInstallationCertificate": {
+                          "baspiRef": "A7.4.1.1",
+                          "title": "Was a gas boiler installed after 1st April 2005, or a solid fuel or oil boiler installed after 1st October 2010?",
                           "discriminator": {
                             "propertyName": "yesNo"
                           },
@@ -4976,8 +5598,8 @@
                                   ]
                                 },
                                 "attachments": {
-                                  "baspiRef": "A7.1.3.2",
-                                  "title": "Please supply the appropriate permit to discharge or exemption certificate",
+                                  "baspiRef": "A7.4.1.2",
+                                  "title": "Please supply a copy of the installation completion certificate from a competent person qualified under the relevant self-certification scheme e.g. HETAS etc",
                                   "enum": [
                                     "Attached",
                                     "To follow"
@@ -4994,7 +5616,7 @@
                           ],
                           "properties": {
                             "yesNo": {
-                              "baspiRef": "A7.1.3.1",
+                              "baspiRef": "A10.1.1",
                               "enum": [
                                 "Yes",
                                 "No"
@@ -5002,9 +5624,22 @@
                             }
                           }
                         },
-                        "plantDrainsIntoWaterway": {
-                          "baspiRef": "A7.1.4",
-                          "title": "Does the septic tank, cesspit or sewerage treatment plant drain into a waterway (lake, river, stream etc)",
+                        "heatingLastServicedDate": {
+                          "baspiRef": "A7.4.2.1",
+                          "title": "When was the heating system last serviced or maintained?"
+                        },
+                        "heatingLastServicedReport": {
+                          "baspiRef": "A7.4.2.2",
+                          "title": "Please provide a copy of the service or maintenance works report.",
+                          "enum": [
+                            "Attached",
+                            "To follow",
+                            "Not available"
+                          ]
+                        },
+                        "heatingInGoodWorkingOrder": {
+                          "baspiRef": "A7.4.3",
+                          "title": "Is the heating system in good working order to your satisfaction?",
                           "discriminator": {
                             "propertyName": "yesNo"
                           },
@@ -5013,7 +5648,7 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "No, the effluent is discharged through a soakaway system."
+                                    "Yes"
                                   ]
                                 }
                               }
@@ -5022,20 +5657,16 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "Yes"
+                                    "No"
                                   ]
                                 },
-                                "dischargeCompliesWithGBR": {
-                                  "baspiRef": "A7.1.4.1",
-                                  "title": "Does it comply with the General Binding Rules for discharge into a waterway?",
-                                  "enum": [
-                                    "Yes",
-                                    "No, it does not comply with the rules for discharge into a waterway."
-                                  ]
+                                "details": {
+                                  "baspiRef": "A7.4.3.2",
+                                  "title": "Please provide details"
                                 }
                               },
                               "required": [
-                                "dischargeCompliesWithGBR"
+                                "details"
                               ]
                             }
                           ],
@@ -5044,255 +5675,181 @@
                           ],
                           "properties": {
                             "yesNo": {
-                              "baspiRef": "A7.1.4.1",
+                              "baspiRef": "A7.4.3.1",
                               "enum": [
                                 "Yes",
-                                "No, the effluent is discharged through a soakaway system."
+                                "No"
                               ]
                             }
                           }
                         }
-                      },
-                      "required": [
-                        "sustainableDrainageSystem",
-                        "septicTank",
-                        "cesspit",
-                        "sewerageTreatmentPlant",
-                        "otherConnectedProperties",
-                        "yearSystemInstalled",
-                        "plantOnOtherLand",
-                        "plantRegistered",
-                        "plantDrainsIntoWaterway"
-                      ]
-                    }
-                  ],
-                  "required": [
-                    "yesNo"
-                  ],
-                  "properties": {
-                    "yesNo": {
-                      "baspiRef": "A7.1.0.11.1",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  }
-                },
-                "maintenanceAgreements": {
-                  "baspiRef": "A7.2",
-                  "title": "Do you have any licences, maintenance agreements, contracts or service agreements in relation to these services?",
-                  "discriminator": {
-                    "propertyName": "yesNo"
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
                       }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "details": {
-                          "baspiRef": "A7.2.2",
-                          "title": "Details"
-                        },
-                        "attachments": {
-                          "baspiRef": "A7.2.3",
-                          "title": "Attachments",
-                          "enum": [
-                            "Attached",
-                            "To follow"
-                          ]
-                        }
-                      },
-                      "required": [
-                        "details",
-                        "attachments"
-                      ]
                     }
-                  ],
+                  },
                   "required": [
-                    "yesNo"
-                  ],
-                  "properties": {
-                    "yesNo": {
-                      "baspiRef": "A7.2.1",
-                      "enum": [
-                        "Yes",
-                        "No"
-                      ]
-                    }
-                  }
+                    "centralHeatingDetails"
+                  ]
                 }
-              }
-            },
-            "greenDealLoan": {
-              "baspiRef": "A7.3",
-              "title": "Green Deal Loan",
+              ],
               "required": [
-                "hasGreenDealLoan"
+                "hasCentralHeating"
               ],
               "properties": {
-                "hasGreenDealLoan": {
-                  "baspiRef": "A7.3",
-                  "title": "Is this property subject to a Green Deal loan or other financed home improvement scheme?",
-                  "discriminator": {
-                    "propertyName": "yesNo"
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "details": {
-                          "baspiRef": "A7.3.2",
-                          "title": "Please provide details below including any outstanding payments for the renewable devices and any feed-in tariffs and a copy of your last electricity bill"
-                        },
-                        "attachments": {
-                          "baspiRef": "A7.3.3",
-                          "title": "Attachments",
-                          "enum": [
-                            "Attached",
-                            "To follow"
-                          ]
-                        }
-                      },
-                      "required": [
-                        "details",
-                        "attachments"
-                      ]
-                    }
-                  ],
-                  "required": [
-                    "yesNo"
-                  ],
-                  "properties": {
-                    "yesNo": {
-                      "baspiRef": "A7.3.1",
-                      "enum": [
-                        "Yes",
-                        "No"
-                      ]
-                    }
-                  }
+                "hasCentralHeating": {
+                  "baspiRef": "A7.4.0",
+                  "title": "Is there full/partial central heating in your property?",
+                  "enum": [
+                    "Yes",
+                    "No"
+                  ]
                 }
               }
             },
-            "centralHeating": {
-              "baspiRef": "A7.4",
-              "title": "Central Heating",
+            "insurance": {
+              "baspiRef": "A8",
+              "title": "Insurance",
               "discriminator": {
-                "propertyName": "hasCentralHeating"
+                "propertyName": "isInsured"
               },
               "oneOf": [
                 {
                   "properties": {
-                    "hasCentralHeating": {
+                    "isInsured": {
                       "enum": [
                         "No"
                       ]
+                    },
+                    "details": {
+                      "baspiRef": "A8.1.1",
+                      "title": "Why not?"
+                    },
+                    "landlordInsuresIfFlat": {
+                      "baspiRef": "A8.1.2",
+                      "title": "If the property is a flat, does the landlord insure the building?",
+                      "enum": [
+                        "Yes",
+                        "No",
+                        "Not applicable"
+                      ]
                     }
-                  }
+                  },
+                  "required": [
+                    "details",
+                    "landlordInsuresIfFlat"
+                  ]
                 },
                 {
                   "properties": {
-                    "hasCentralHeating": {
+                    "isInsured": {
                       "enum": [
                         "Yes"
                       ]
                     },
-                    "centralHeatingDetails": {
+                    "difficultiesObtainingInsurance": {
+                      "baspiRef": "A8.1.2.1",
+                      "title": "Have you had any difficulty obtaining competitively priced building insurance due to the structure or location of the property or had insurance refused?",
                       "required": [
-                        "centralHeatingFuel",
-                        "centralHeatingInstalled",
-                        "boilerInstallationCertificate",
-                        "heatingLastServiced",
-                        "heatingInGoodWorkingOrder"
+                        "abnormalRiseInPremiums",
+                        "subjectToHighExcesses",
+                        "subjectToUnusualConditions",
+                        "refused"
                       ],
                       "properties": {
-                        "centralHeatingFuel": {
-                          "baspiRef": "A7.4.0.1",
-                          "title": "Central Heating Fuel",
+                        "abnormalRiseInPremiums": {
+                          "baspiRef": "A8.1.2.1.1",
+                          "title": "Subject to abnormal rise in premiums?",
                           "discriminator": {
-                            "propertyName": "centralHeatingFuelType"
+                            "propertyName": "yesNo"
+                          },
+                          "oneOf": [
+                            {
+                              "properties": {
+                                "yesNo": {
+                                  "enum": [
+                                    "No"
+                                  ]
+                                }
+                              }
+                            },
+                            {
+                              "properties": {
+                                "yesNo": {
+                                  "enum": [
+                                    "Yes"
+                                  ]
+                                },
+                                "details": {
+                                  "baspiRef": "A8.1.2.1.3",
+                                  "title": "Provide details"
+                                }
+                              },
+                              "required": [
+                                "details"
+                              ]
+                            }
+                          ],
+                          "required": [
+                            "yesNo"
+                          ],
+                          "properties": {
+                            "yesNo": {
+                              "baspiRef": "A8.1.2.1.2",
+                              "enum": [
+                                "Yes",
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        "subjectToHighExcesses": {
+                          "baspiRef": "A8.1.1.2",
+                          "title": "Subject to high excesses?",
+                          "discriminator": {
+                            "propertyName": "yesNo"
                           },
                           "oneOf": [
                             {
                               "properties": {
-                                "centralHeatingFuelType": {
+                                "yesNo": {
                                   "enum": [
-                                    "Gas",
-                                    "Electricity",
-                                    "Oil",
-                                    "LPG"
+                                    "No"
                                   ]
                                 }
                               }
                             },
                             {
                               "properties": {
-                                "centralHeatingFuelType": {
+                                "yesNo": {
                                   "enum": [
-                                    "Other"
+                                    "Yes"
                                   ]
                                 },
-                                "otherCentralHeatingFuelType": {
-                                  "baspiRef": "A7.4.0.3",
-                                  "title": "Please describe the other fuel type"
+                                "details": {
+                                  "baspiRef": "A8.1.2.1.2.2",
+                                  "title": "Provide details"
                                 }
                               },
                               "required": [
-                                "otherCentralHeatingFuelType"
+                                "details"
                               ]
                             }
                           ],
                           "required": [
-                            "centralHeatingFuelType"
+                            "yesNo"
                           ],
                           "properties": {
-                            "centralHeatingFuelType": {
-                              "baspiRef": "A7.4.0.2",
-                              "title": "What type of fuel does the system and boiler run on?",
+                            "yesNo": {
+                              "baspiRef": "A8.1.1.2.1",
                               "enum": [
-                                "Gas",
-                                "Electricity",
-                                "Oil",
-                                "LPG",
-                                "Other"
+                                "Yes",
+                                "No"
                               ]
                             }
                           }
                         },
-                        "centralHeatingInstalled": {
-                          "baspiRef": "A7.4.1",
-                          "title": "When was the heating system and boiler installed?"
-                        },
-                        "boilerInstallationCertificate": {
-                          "baspiRef": "A7.4.1.1",
-                          "title": "Was a gas boiler installed after 1st April 2005, or a solid fuel or oil boiler installed after 1st October 2010?",
+                        "subjectToUnusualConditions": {
+                          "baspiRef": "A8.1.2.1.3",
+                          "title": "Subject to unusual conditions?",
                           "discriminator": {
                             "propertyName": "yesNo"
                           },
@@ -5313,17 +5870,13 @@
                                     "Yes"
                                   ]
                                 },
-                                "attachments": {
-                                  "baspiRef": "A7.4.1.2",
-                                  "title": "Please supply a copy of the installation completion certificate from a competent person qualified under the relevant self-certification scheme e.g. HETAS etc",
-                                  "enum": [
-                                    "Attached",
-                                    "To follow"
-                                  ]
+                                "details": {
+                                  "baspiRef": "A8.1.2.1.3.2",
+                                  "title": "Provide details"
                                 }
                               },
                               "required": [
-                                "attachments"
+                                "details"
                               ]
                             }
                           ],
@@ -5332,7 +5885,7 @@
                           ],
                           "properties": {
                             "yesNo": {
-                              "baspiRef": "A10.1.1",
+                              "baspiRef": "A8.1.2.1.3.1",
                               "enum": [
                                 "Yes",
                                 "No"
@@ -5340,22 +5893,9 @@
                             }
                           }
                         },
-                        "heatingLastServicedDate": {
-                          "baspiRef": "A7.4.2.1",
-                          "title": "When was the heating system and boiler last serviced or maintained?"
-                        },
-                        "heatingLastServicedReport": {
-                          "baspiRef": "A7.4.2.2",
-                          "title": "Please provide a copy of the service or maintenance works report.",
-                          "enum": [
-                            "Attached",
-                            "To follow",
-                            "N/A"
-                          ]
-                        },
-                        "heatingInGoodWorkingOrder": {
-                          "baspiRef": "A7.4.3",
-                          "title": "Is the heating system in good working order to your satisfaction?",
+                        "refused": {
+                          "baspiRef": "A8.1.2.1.4",
+                          "title": "Refused?",
                           "discriminator": {
                             "propertyName": "yesNo"
                           },
@@ -5364,7 +5904,7 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "Yes"
+                                    "No"
                                   ]
                                 }
                               }
@@ -5373,12 +5913,12 @@
                               "properties": {
                                 "yesNo": {
                                   "enum": [
-                                    "No"
+                                    "Yes"
                                   ]
                                 },
                                 "details": {
-                                  "baspiRef": "A7.4.3.2",
-                                  "title": "Please provide details"
+                                  "baspiRef": "A8.1.2.1.4.2",
+                                  "title": "Provide details"
                                 }
                               },
                               "required": [
@@ -5391,7 +5931,7 @@
                           ],
                           "properties": {
                             "yesNo": {
-                              "baspiRef": "A7.4.3.1",
+                              "baspiRef": "A8.1.2.1.4.1",
                               "enum": [
                                 "Yes",
                                 "No"
@@ -5400,103 +5940,6 @@
                           }
                         }
                       }
-                    }
-                  },
-                  "required": [
-                    "centralHeatingDetails"
-                  ]
-                }
-              ],
-              "required": [
-                "hasCentralHeating"
-              ],
-              "properties": {
-                "hasCentralHeating": {
-                  "baspiRef": "A7.4.0",
-                  "title": "Is there full/partial central heating in your property?",
-                  "enum": [
-                    "Yes",
-                    "No"
-                  ]
-                }
-              }
-            },
-            "insurance": {
-              "baspiRef": "A8",
-              "title": "Insurance",
-              "discriminator": {
-                "propertyName": "isInsured"
-              },
-              "oneOf": [
-                {
-                  "properties": {
-                    "isInsured": {
-                      "enum": [
-                        "No"
-                      ]
-                    },
-                    "details": {
-                      "baspiRef": "A8.1.1",
-                      "title": "Why not?"
-                    }
-                  },
-                  "required": [
-                    "details"
-                  ]
-                },
-                {
-                  "properties": {
-                    "isInsured": {
-                      "enum": [
-                        "Yes"
-                      ]
-                    },
-                    "difficultiesObtainingInsurance": {
-                      "baspiRef": "A8.1.2",
-                      "title": "Have you had any difficulty obtaining competitively priced building insurance due to the structure or location of the property or had insurance refused?",
-                      "description": "(e.g. high premiums, excess over £1,500, special conditions etc)",
-                      "discriminator": {
-                        "propertyName": "yesNo"
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No"
-                              ]
-                            }
-                          }
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "details": {
-                              "baspiRef": "A8.1.2.2",
-                              "title": "Provide details"
-                            }
-                          },
-                          "required": [
-                            "details"
-                          ]
-                        }
-                      ],
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "baspiRef": "A8.1.2.1",
-                          "enum": [
-                            "Yes",
-                            "No"
-                          ]
-                        }
-                      }
                     },
                     "insuranceClaims": {
                       "baspiRef": "A8.2",
@@ -5933,10 +6376,12 @@
                   "title": "Do you know if any of the following rights or arrangements affect the property?",
                   "required": [
                     "publicRightOfWay",
-                    "rightsOfLightOrSupport",
+                    "rightsOfLight",
+                    "rightsOfSupport",
                     "rightsCreatedThroughCustom",
                     "minesAndMinerals",
                     "churchChancel",
+                    "rightsToTakeFromLand",
                     "otherRights"
                   ],
                   "properties": {
@@ -5995,9 +6440,55 @@
                         }
                       }
                     },
-                    "rightsOfLightOrSupport": {
-                      "baspiRef": "A10.4.2",
-                      "title": "Rights of light or support for other properties",
+                    "rightsOfLight": {
+                      "baspiRef": "A10.4.2a",
+                      "title": "Rights of light",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "details": {
+                              "baspiRef": "A10.4.2a.2",
+                              "title": "Details"
+                            }
+                          },
+                          "required": [
+                            "details"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "baspiRef": "A10.4.2a.1",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    "rightsOfSupport": {
+                      "baspiRef": "A10.4.2b",
+                      "title": "Rights of support from ajoining properties",
                       "discriminator": {
                         "propertyName": "yesNo"
                       },
@@ -6019,7 +6510,7 @@
                               ]
                             },
                             "details": {
-                              "baspiRef": "A10.4.2.2",
+                              "baspiRef": "A10.4.2b.2",
                               "title": "Details"
                             }
                           },
@@ -6033,7 +6524,7 @@
                       ],
                       "properties": {
                         "yesNo": {
-                          "baspiRef": "A10.4.2.1",
+                          "baspiRef": "A10.4.2b.1",
                           "enum": [
                             "Yes",
                             "No"
@@ -6042,8 +6533,54 @@
                       }
                     },
                     "rightsCreatedThroughCustom": {
-                      "baspiRef": "A10.4.3",
-                      "title": "Rights created through custom or use (e.g. rights to graze on other land or forage, rights of the lord of the manor or others to take things from your property etc)",
+                      "baspiRef": "A10.4.3a",
+                      "title": "Rights created through custom or use (e.g. rights to graze on other land or forage)",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "details": {
+                              "baspiRef": "A10.4.3a2",
+                              "title": "Details"
+                            }
+                          },
+                          "required": [
+                            "details"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "baspiRef": "A10.4.3a1",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    "rightsToTakeFromLand": {
+                      "baspiRef": "A10.4.3b",
+                      "title": "Other people's rights to take things from the land (such as timber, hay or fish)",
                       "discriminator": {
                         "propertyName": "yesNo"
                       },
@@ -6065,7 +6602,7 @@
                               ]
                             },
                             "details": {
-                              "baspiRef": "A10.4.3.2",
+                              "baspiRef": "A10.4.3b2",
                               "title": "Details"
                             }
                           },
@@ -6079,7 +6616,7 @@
                       ],
                       "properties": {
                         "yesNo": {
-                          "baspiRef": "A10.4.3.1",
+                          "baspiRef": "A10.4.3b1",
                           "enum": [
                             "Yes",
                             "No"
@@ -6280,42 +6817,46 @@
                             "groundWater": {
                               "baspiRef": "A11.1.2.2.1",
                               "title": "Ground water",
-                              "required": [
-                                "yesNo"
+                              "enum": [
+                                "Yes",
+                                "No"
                               ]
                             },
                             "sewer": {
                               "baspiRef": "A11.1.2.2.2",
                               "title": "Sewer",
-                              "required": [
-                                "yesNo"
+                              "enum": [
+                                "Yes",
+                                "No"
                               ]
                             },
                             "surfaceWater": {
                               "baspiRef": "A11.1.2.2.3",
                               "title": "Surface water",
-                              "required": [
-                                "yesNo"
+                              "enum": [
+                                "Yes",
+                                "No"
                               ]
                             },
                             "coastal": {
                               "baspiRef": "A11.1.2.2.4",
                               "title": "Coastal flooding",
-                              "required": [
-                                "yesNo"
+                              "enum": [
+                                "Yes",
+                                "No"
                               ]
                             },
                             "river": {
                               "baspiRef": "A11.1.2.2.5",
                               "title": "River flooding",
-                              "required": [
-                                "yesNo"
+                              "enum": [
+                                "Yes",
+                                "No"
                               ]
                             },
                             "other": {
                               "baspiRef": "A11.1.2.2.6",
                               "title": "Other",
-                              "description": "Please state",
                               "discriminator": {
                                 "propertyName": "yesNo"
                               },
@@ -6337,7 +6878,7 @@
                                       ]
                                     },
                                     "details": {
-                                      "baspiRef": "A11.1.2.2.6.1",
+                                      "baspiRef": "A11.1.2.2.6.2",
                                       "title": "Please stata"
                                     }
                                   },
@@ -6348,7 +6889,16 @@
                               ],
                               "required": [
                                 "yesNo"
-                              ]
+                              ],
+                              "properties": {
+                                "yesNo": {
+                                  "baspiRef": "A11.1.2.2.6.1",
+                                  "enum": [
+                                    "Yes",
+                                    "No"
+                                  ]
+                                }
+                              }
                             }
                           }
                         }
@@ -6457,11 +7007,15 @@
                             },
                             "details": {
                               "baspiRef": "A11.1.3.2",
-                              "title": "Please supply a copy of the report and indicate if the test result was below the recommended level."
+                              "title": "Was the test result was below the recommended action level?",
+                              "enum": [
+                                "Yes",
+                                "No"
+                              ]
                             },
                             "attachments": {
                               "baspiRef": "A11.1.3.3",
-                              "title": "Attachments",
+                              "title": "Please supply a copy of the report",
                               "enum": [
                                 "Attached",
                                 "To follow"
@@ -6488,15 +7042,18 @@
                       }
                     },
                     "remedialMeasuresOnConstruction": {
+                      "baspiRef": "A11.1.3.4",
+                      "title": "Were any remedial measures undertaken on construction to reduce Radon gas levels on the property?",
                       "required": [
                         "yesNo"
                       ],
                       "properties": {
                         "yesNo": {
-                          "baspiRef": "A11.1.3.4",
+                          "baspiRef": "A11.1.3.4.1",
                           "enum": [
                             "Yes",
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -6514,7 +7071,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -6784,7 +7342,8 @@
               "title": "Additional Information",
               "required": [
                 "restrictionsOnUseNotCompliedWith",
-                "otherMaterialIssue"
+                "otherMaterialIssue",
+                "otherCharges"
               ],
               "properties": {
                 "restrictionsOnUseNotCompliedWith": {
@@ -6895,6 +7454,52 @@
                       ]
                     }
                   }
+                },
+                "otherCharges": {
+                  "baspiRef": "A12.3",
+                  "title": "Does the seller have to pay any charges relating to the property (excluding any payments such as council tax, utility charges, etc.), for example payments to a management company?",
+                  "discriminator": {
+                    "propertyName": "yesNo"
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
+                          ]
+                        },
+                        "details": {
+                          "baspiRef": "A12.3.2",
+                          "title": "Please give details"
+                        }
+                      },
+                      "required": [
+                        "details"
+                      ]
+                    }
+                  ],
+                  "required": [
+                    "yesNo"
+                  ],
+                  "properties": {
+                    "yesNo": {
+                      "baspiRef": "A12.3.1",
+                      "enum": [
+                        "Yes",
+                        "No"
+                      ]
+                    }
+                  }
                 }
               }
             },
@@ -6934,6 +7539,9 @@
             "legalOwners": {
               "baspiRef": "B1",
               "title": "Legal Owners",
+              "required": [
+                "namesOfLegalOwners"
+              ],
               "properties": {
                 "namesOfLegalOwners": {
                   "baspiRef": "B1.1",
@@ -7107,6 +7715,12 @@
                         "uniformBoundaries": {
                           "baspiRef": "B2.1.0.2",
                           "title": "Please indicate who has repaired, or treated as belonging to them, each of the boundaries. Identify each boundary as if you were looking at the property from the road.",
+                          "required": [
+                            "left",
+                            "right",
+                            "rear",
+                            "front"
+                          ],
                           "properties": {
                             "left": {
                               "baspiRef": "B2.1.1",
@@ -7150,13 +7764,7 @@
                             }
                           }
                         }
-                      },
-                      "required": [
-                        "left",
-                        "right",
-                        "rear",
-                        "front"
-                      ]
+                      }
                     },
                     {
                       "properties": {
@@ -7187,7 +7795,7 @@
                       "properties": {
                         "areBoundariesUniform": {
                           "enum": [
-                            "N/A"
+                            "Not applicable"
                           ]
                         }
                       }
@@ -7203,7 +7811,7 @@
                       "enum": [
                         "Yes",
                         "No",
-                        "N/A"
+                        "Not applicable"
                       ]
                     }
                   }
@@ -7220,7 +7828,7 @@
                         "yesNo": {
                           "enum": [
                             "No",
-                            "N/A"
+                            "Not applicable"
                           ]
                         }
                       }
@@ -7251,7 +7859,7 @@
                       "enum": [
                         "Yes",
                         "No",
-                        "N/A"
+                        "Not applicable"
                       ]
                     }
                   }
@@ -7268,7 +7876,7 @@
                         "yesNo": {
                           "enum": [
                             "No",
-                            "N/A"
+                            "Not applicable"
                           ]
                         }
                       }
@@ -7299,7 +7907,7 @@
                       "enum": [
                         "Yes",
                         "No",
-                        "N/A"
+                        "Not applicable"
                       ]
                     }
                   }
@@ -7307,7 +7915,7 @@
                 "flyingFreehold": {
                   "baspiRef": "B2.5",
                   "title": "Is there a flying freehold?",
-                  "description": "NOTE: a flying freehold is when part of the property overhangs a neighbour’s property or an accessway - eg a terrace house where part of the upstairs is over an accessway which belongs to someone else.",
+                  "description": "NOTE: a flying freehold is when part of the property overhangs a neighbour’s property or an accessway - e.g. a terrace house where part of the upstairs is over an accessway which belongs to someone else.",
                   "discriminator": {
                     "propertyName": "yesNo"
                   },
@@ -7317,7 +7925,7 @@
                         "yesNo": {
                           "enum": [
                             "No",
-                            "N/A"
+                            "Not applicable"
                           ]
                         }
                       }
@@ -7348,7 +7956,7 @@
                       "enum": [
                         "Yes",
                         "No",
-                        "N/A"
+                        "Not applicable"
                       ]
                     }
                   }
@@ -7375,7 +7983,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -7413,7 +8022,8 @@
                       "baspiRef": "B3.1.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -7429,7 +8039,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -7467,7 +8078,8 @@
                       "baspiRef": "B3.2.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -7483,7 +8095,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -7521,7 +8134,8 @@
                       "baspiRef": "B3.3.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -7562,11 +8176,11 @@
                         },
                         "yearTested": {
                           "baspiRef": "B4.1.2",
-                          "title": "State the year they were last tested and upload the test certificate."
+                          "title": "State the year they were last tested"
                         },
                         "attachments": {
                           "baspiRef": "B4.1.3",
-                          "title": "Attachments",
+                          "title": "Please upload the test certificate.",
                           "enum": [
                             "Attached",
                             "To follow"
@@ -7574,7 +8188,7 @@
                         }
                       },
                       "required": [
-                        "details",
+                        "yearTested",
                         "attachments"
                       ]
                     }
@@ -7603,7 +8217,8 @@
                       "properties": {
                         "yesNo": {
                           "enum": [
-                            "No"
+                            "No",
+                            "Not known"
                           ]
                         }
                       }
@@ -7617,15 +8232,31 @@
                         },
                         "yearWorkCarriedOut": {
                           "baspiRef": "B4.2.2",
-                          "title": "State the year the work was carried"
+                          "title": "State the year the work was carried out"
                         },
                         "details": {
                           "baspiRef": "B4.2.3",
                           "title": "Provide details"
                         },
-                        "attachments": {
-                          "baspiRef": "B4.2.4",
-                          "title": "Please supply the signed Electrical Safety Certificate (BS7671) and Building Regulations Compliance Certificate (or equivalent)",
+                        "electricalSafetyCertificate": {
+                          "baspiRef": "B4.2.4.1",
+                          "title": "Please provide a signed Electrical Safety Certificate (BS7671)",
+                          "enum": [
+                            "Attached",
+                            "To follow"
+                          ]
+                        },
+                        "buildingRegulationsComplianceCertificate": {
+                          "baspiRef": "B4.2.4.2",
+                          "title": "or a Building Regulations Compliance Certificate (or equivalent)",
+                          "enum": [
+                            "Attached",
+                            "To follow"
+                          ]
+                        },
+                        "buildingControlCompletionCertificate": {
+                          "baspiRef": "B4.2.4.3",
+                          "title": "or a Building Control Completion Certificate",
                           "enum": [
                             "Attached",
                             "To follow"
@@ -7633,8 +8264,8 @@
                         }
                       },
                       "required": [
-                        "details",
-                        "attachments"
+                        "yearWorkCarriedOut",
+                        "details"
                       ]
                     }
                   ],
@@ -7646,7 +8277,8 @@
                       "baspiRef": "B4.2.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "Not known"
                       ]
                     }
                   }
@@ -7762,7 +8394,7 @@
                                 },
                                 "attachments": {
                                   "baspiRef": "4.3.3.3",
-                                  "title": "please supply copies of the relevant documents",
+                                  "title": "Please supply copies of the relevant documents",
                                   "enum": [
                                     "Attached",
                                     "To follow"
@@ -7954,7 +8586,7 @@
                     },
                     "attachments": {
                       "baspiRef": "4.6.1.2",
-                      "title": "Photograph of meter location",
+                      "title": "Photograph of stopcock location",
                       "enum": [
                         "Attached",
                         "To follow"
@@ -8201,9 +8833,161 @@
                         "Yes"
                       ]
                     },
-                    "newHomeWarranty": {
-                      "baspiRef": "B5.1.1",
-                      "title": "New Home Warranty (NHBC or similar)",
+                    "newHomeWarranty": {
+                      "baspiRef": "B5.1.1",
+                      "title": "New Home Warranty (NHBC or similar)",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "details": {
+                              "baspiRef": "B5.1.1.2",
+                              "title": "Please confirm the name of the warranty provider and the date of the warranty"
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.3",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "details",
+                            "attachments"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "baspiRef": "B5.1.1.1",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    "roofingWork": {
+                      "baspiRef": "B5.1.2",
+                      "title": "Roofing work",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.2",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "baspiRef": "B5.1.2.1",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    "dampProofingTreatment": {
+                      "baspiRef": "B5.1.3",
+                      "title": "Damp proofing treatment",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.2",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
+                      "required": [
+                        "yesNo"
+                      ],
+                      "properties": {
+                        "yesNo": {
+                          "baspiRef": "B5.1.3.1",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    "timberRotOrInfestationTreatment": {
+                      "baspiRef": "B5.1.4",
+                      "title": "Timber rot or infestation treatment",
                       "discriminator": {
                         "propertyName": "yesNo"
                       },
@@ -8224,12 +9008,8 @@
                                 "Yes"
                               ]
                             },
-                            "details": {
-                              "baspiRef": "B5.1.1.2",
-                              "title": "Please confirm the name of the warranty provider and the date of the warranty"
-                            },
                             "attachments": {
-                              "baspiRef": "B5.1.1.3",
+                              "baspiRef": "B5.1.1.2",
                               "enum": [
                                 "Attached",
                                 "To follow"
@@ -8237,7 +9017,6 @@
                             }
                           },
                           "required": [
-                            "details",
                             "attachments"
                           ]
                         }
@@ -8245,54 +9024,6 @@
                       "required": [
                         "yesNo"
                       ],
-                      "properties": {
-                        "yesNo": {
-                          "baspiRef": "B5.1.1.1",
-                          "enum": [
-                            "Yes",
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    "roofingWork": {
-                      "baspiRef": "B5.1.2",
-                      "title": "Roofing work",
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "baspiRef": "B5.1.2.1",
-                          "enum": [
-                            "Yes",
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    "dampProofingTreatment": {
-                      "baspiRef": "B5.1.3",
-                      "title": "Damp proofing treatment",
-                      "required": [
-                        "yesNo"
-                      ],
-                      "properties": {
-                        "yesNo": {
-                          "baspiRef": "B5.1.3.1",
-                          "enum": [
-                            "Yes",
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    "timberRotOrInfestationTreatment": {
-                      "baspiRef": "B5.1.4",
-                      "title": "Timber rot or infestation treatment",
-                      "required": [
-                        "yesNo"
-                      ],
                       "properties": {
                         "yesNo": {
                           "baspiRef": "B5.1.4.1",
@@ -8306,6 +9037,39 @@
                     "centralHeatingAndorPlumbing": {
                       "baspiRef": "B5.1.5",
                       "title": "Central heating and/or plumbing",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.2",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
                       "required": [
                         "yesNo"
                       ],
@@ -8322,6 +9086,39 @@
                     "doubleGlazing": {
                       "baspiRef": "B5.1.6",
                       "title": "Double glazing (windows, doors, roof lights, conservatory etc)",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.2",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
                       "required": [
                         "yesNo"
                       ],
@@ -8338,6 +9135,39 @@
                     "electricalRepairOrInstallation": {
                       "baspiRef": "B5.1.7",
                       "title": "Electrical repair or installation",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.2",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
                       "required": [
                         "yesNo"
                       ],
@@ -8354,6 +9184,39 @@
                     "subsidenceWork": {
                       "baspiRef": "B5.1.8",
                       "title": "Underpinning or other preventative work and/or remedial action relating to subsidence",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.2",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
                       "required": [
                         "yesNo"
                       ],
@@ -8370,6 +9233,39 @@
                     "solarPanels": {
                       "baspiRef": "B5.1.9",
                       "title": "Solar panels",
+                      "discriminator": {
+                        "propertyName": "yesNo"
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "attachments": {
+                              "baspiRef": "B5.1.1.2",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "attachments"
+                          ]
+                        }
+                      ],
                       "required": [
                         "yesNo"
                       ],
@@ -8429,10 +9325,6 @@
                         }
                       }
                     },
-                    "willLeaveGuaranteePaperwork": {
-                      "baspiRef": "B5.1.11",
-                      "title": "Please confirm that you will leave all paperwork relating to any guarantee or warranty at the property when you move out"
-                    },
                     "outstandingClaimsOrApplications": {
                       "baspiRef": "B5.2",
                       "title": "Are there any outstanding claims or current applications relating to any of the above?",
@@ -8554,7 +9446,6 @@
                     "subsidenceWork",
                     "solarPanels",
                     "otherGuarantees",
-                    "willLeaveGuaranteePaperwork",
                     "outstandingClaimsOrApplications",
                     "titleDefectInsurance"
                   ]
@@ -8655,7 +9546,7 @@
                                 },
                                 "details": {
                                   "baspiRef": "B6.4.1",
-                                  "title": "Please provide details (eg the property is sold let to tenants)"
+                                  "title": "Please provide details (e.g. the property is sold let to tenants)"
                                 },
                                 "attachments": {
                                   "baspiRef": "B6.4.2",
@@ -8682,7 +9573,16 @@
                                   "title": "Have all occupiers aged 17 or over agreed to leave prior to completion?",
                                   "required": [
                                     "yesNo"
-                                  ]
+                                  ],
+                                  "properties": {
+                                    "yesNo": {
+                                      "baspiRef": "B6.3.1.1",
+                                      "enum": [
+                                        "Yes",
+                                        "No"
+                                      ]
+                                    }
+                                  }
                                 },
                                 "aged17OrOverWillSignToConfirmWillVacate": {
                                   "baspiRef": "B6.3.2",
@@ -8709,11 +9609,11 @@
                                         },
                                         "details": {
                                           "baspiRef": "B6.3.2.2",
-                                          "title": "Please supply other evidence that the property will be vacant on completion."
+                                          "title": "Please provide details (eg the property is sold let to tenants)"
                                         },
                                         "attachments": {
                                           "baspiRef": "B6.3.2.3",
-                                          "title": "Attachments",
+                                          "title": "Please supply other evidence that the property will be vacant on completion (a copy of the tenancy agreement together with a copy of any notice to quit which has been served upon them).",
                                           "enum": [
                                             "Attached",
                                             "To follow"
@@ -8721,7 +9621,8 @@
                                         }
                                       },
                                       "required": [
-                                        "details"
+                                        "details",
+                                        "attachments"
                                       ]
                                     }
                                   ],
@@ -8787,16 +9688,34 @@
               "baspiRef": "B7",
               "title": "Completion and Moving",
               "required": [
-                "willRemoveAllRubbish",
+                "sellerWillEnsure",
                 "otherPropertyInChain",
                 "moveRestrictionDates",
-                "digitalPropertyLogbook"
+                "digitalPropertyLogbook",
+                "sufficientToRepayAllMortgages"
               ],
               "properties": {
-                "willRemoveAllRubbish": {
+                "sellerWillEnsure": {
                   "baspiRef": "B7.1",
-                  "title": "Please confirm that on completion you will remove all rubbish and items not included in the sale from the property including its garden, loft and any sheds or outbuildings.",
-                  "description": "When the property is cleared out you will be expected to take reasonable care when clearing the property, leaving it clean and tidy and repairing any damage caused when removing items from the property and making safe any light or electrical fittings which are being removed.\n\nKeys for all door and window locks, along with any alarm codes, should be available for the buyer on the day of completion.  If there is any reason why you cannot do this you should let the estate agent and your property lawyer know. For all internet connected services eg doorbells, boiler controls, burglar alarms, CCTV cameras etc) access to them will need to be provided to the buyer on the day of completion so that they can control them or sign up to the service.  If there is any reason why you cannot do this you should let the estate agent and your property lawyer know."
+                  "title": "Please confirm that on completion you will:",
+                  "properties": {
+                    "removeRubbish": {
+                      "baspiRef": "B7.1.1",
+                      "title": "Remove all rubbish and items not included in the sale from the property (including its garden, loft and any sheds or outbuildings) and leave the property in a clean and tidy condition."
+                    },
+                    "replaceLightFittings": {
+                      "baspiRef": "B7.1.2",
+                      "title": "If light fittings are removed, the fittings will be replaced with ceiling rose, flex, bulb holder and bulb."
+                    },
+                    "takeReasonableCare": {
+                      "baspiRef": "B7.1.3",
+                      "title": "Take reasonable care when removing any other fittings or contents."
+                    },
+                    "leaveKeys": {
+                      "baspiRef": "B7.1.4",
+                      "title": "Leave keys for all door and window locks, along with any alarm codes, for the buyer on the day of completion."
+                    }
+                  }
                 },
                 "otherPropertyInChain": {
                   "baspiRef": "B7.2",
@@ -8903,15 +9822,12 @@
                             "Yes"
                           ]
                         },
-                        "restrictedDates": {
-                          "baspiRef": "B7.3.2",
-                          "items": {
-                            "baspiRef": "B7.3.2.1"
-                          }
+                        "details": {
+                          "baspiRef": "B7.3.2"
                         }
                       },
                       "required": [
-                        "restrictedDates"
+                        "details"
                       ]
                     }
                   ],
@@ -8991,7 +9907,8 @@
                       "baspiRef": "A7.6.1",
                       "enum": [
                         "Yes",
-                        "No"
+                        "No",
+                        "No mortgage"
                       ]
                     }
                   }