@pdtf/schemas 3.0.0-2 → 3.0.0-20

package/src/schemas/v3/pdtf-transaction.json

@@ -164,143 +164,6 @@
               "title": "Unique Property Reference Number ",
               "type": "integer"
             },
-            "propertyType": {
-              "title": "Type of Property",
-              "description": "The type or category of the property.",
-              "type": "string",
-              "enum": [
-                "Not Specified",
-                "Terraced House",
-                "End of terrace house",
-                "Semi-detached house",
-                "Detached house",
-                "Mews house",
-                "Cluster house",
-                "Ground floor flat",
-                "Flat",
-                "Studio flat",
-                "Ground floor maisonette",
-                "Maisonette",
-                "Bungalow",
-                "Terraced bungalow",
-                "Semi-detached bungalow",
-                "Detached bungalow",
-                "Mobile home",
-                "Land (Residential)",
-                "Link detached house",
-                "Town house",
-                "Cottage",
-                "Chalet",
-                "Character Property",
-                "House (unspecified)",
-                "Villa",
-                "Apartment",
-                "Penthouse",
-                "Finca",
-                "Barn Conversion",
-                "Serviced apartment",
-                "Parking",
-                "Sheltered Housing",
-                "Reteirment property",
-                "House share",
-                "Flat share",
-                "Park home",
-                "Garages",
-                "Farm House",
-                "Equestrian facility",
-                "Duplex",
-                "Triplex",
-                "Longere",
-                "Gite",
-                "Barn",
-                "Trulli",
-                "Mill",
-                "Ruins",
-                "Restaurant",
-                "Cafe",
-                "Castle",
-                "Village House",
-                "Cave House",
-                "Cortijo",
-                "Farm Land",
-                "Plot",
-                "Country House",
-                "Stone House",
-                "Caravan",
-                "Lodge",
-                "Log Cabin",
-                "Manor House",
-                "Stately Home",
-                "Off-Plan",
-                "Semi-detached Villa",
-                "Detached Villa",
-                "Bar/Nightclub",
-                "Shop",
-                "Riad",
-                "House Boat",
-                "Hotel Room",
-                "Block of Apartments",
-                "Private Halls",
-                "Office",
-                "Business Park",
-                "Serviced Office",
-                "Retail Property (High Street)",
-                "Retail Property (Out of Town)",
-                "Convenience Store",
-                "Hairdresser/Barber Shop",
-                "Hotel",
-                "Petrol Station",
-                "Post Office",
-                "Pub",
-                "Workshop & Retail Space",
-                "Distribution Warehouse",
-                "Factory",
-                "Heavy Industrial",
-                "Industrial Park",
-                "Light Industrial",
-                "Storage",
-                "Showroom",
-                "Warehouse",
-                "Land (Commercial)",
-                "Commercial Development",
-                "Industrial Development",
-                "Residential Development",
-                "Commercial Property",
-                "Data Centre",
-                "Farm",
-                "Healthcare Facility",
-                "Marine Property",
-                "Mixed Use",
-                "Research & Development Facility",
-                "Science Park",
-                "Guest House",
-                "Hospitality",
-                "Leisure Facility",
-                "Takeaway",
-                "Childcare Facility",
-                "Smallholding",
-                "Place of Worship",
-                "Trade Counter",
-                "Coach House",
-                "House of Multiple Occupation",
-                "Sports facilities",
-                "Spa",
-                "Campsite & Holiday Village"
-              ]
-            },
-            "isNewBuild": {
-              "title": "Is the property a New Build?",
-              "type": "object",
-              "properties": {
-                "yesNo": {
-                  "type": "string",
-                  "enum": [
-                    "Yes",
-                    "No"
-                  ]
-                }
-              }
-            },
             "location": {
               "title": "Geographical location",
               "type": "object",
@@ -404,7 +267,6 @@
                   "title": "Price type",
                   "type": "string",
                   "enum": [
-                    "POA",
                     "Guide price",
                     "Fixed price",
                     "Offers in excess of",
@@ -430,7 +292,7 @@
               "type": "string"
             },
             "marketingTenure": {
-              "title": "Type of tenure being marketed",
+              "title": "What tenure is the property being marketed as?",
               "type": "string",
               "enum": [
                 "Commonhold",
@@ -472,9 +334,133 @@
               }
             },
             "buildInformation": {
-              "title": "Information related to property build",
+              "title": "About the property building",
               "type": "object",
               "properties": {
+                "building": {
+                  "title": "Building information",
+                  "type": "object",
+                  "properties": {
+                    "builtForm": {
+                      "title": "Built form",
+                      "type": "string",
+                      "enum": [
+                        "Detached",
+                        "Semi-detached",
+                        "Mid-terrace",
+                        "End-terrace",
+                        "Other"
+                      ]
+                    },
+                    "propertyType": {
+                      "title": "Property type",
+                      "type": "string",
+                      "enum": [
+                        "House",
+                        "Bungalow",
+                        "Maisonette",
+                        "Flat",
+                        "Park home",
+                        "Other"
+                      ]
+                    }
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "propertyType": {
+                          "enum": [
+                            "Other"
+                          ]
+                        },
+                        "otherType": {
+                          "title": "Please describe the other type of property build",
+                          "type": "string",
+                          "minLength": 1
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "propertyType": {
+                          "enum": [
+                            "House",
+                            "Bungalow"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "propertyType": {
+                          "enum": [
+                            "Maisonette",
+                            "Flat"
+                          ]
+                        },
+                        "numberOfFloors": {
+                          "title": "Number of floors in the building",
+                          "type": "integer"
+                        },
+                        "entranceFloor": {
+                          "title": "Entrance floor",
+                          "description": "Floor level of the entrance floor relative to the lowest level of the property (0 for ground floor). If there is a basement, the basement is level 0 and the other floors are from 1 upwards",
+                          "type": "integer"
+                        },
+                        "hasLift": {
+                          "title": "Is the property served by a lift?",
+                          "type": "string",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        },
+                        "overCommercialPremises": {
+                          "title": "Located over commercial premises?",
+                          "type": "object",
+                          "properties": {
+                            "isLocatedOverCommercialPremises": {
+                              "type": "string",
+                              "title": "Is the property located over commercial premises?",
+                              "enum": [
+                                "Yes",
+                                "No"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "isLocatedOverCommercialPremises"
+                          ],
+                          "oneOf": [
+                            {
+                              "properties": {
+                                "isLocatedOverCommercialPremises": {
+                                  "enum": [
+                                    "No"
+                                  ]
+                                }
+                              }
+                            },
+                            {
+                              "properties": {
+                                "isLocatedOverCommercialPremises": {
+                                  "enum": [
+                                    "Yes"
+                                  ]
+                                },
+                                "details": {
+                                  "title": "Please provide details",
+                                  "type": "string",
+                                  "minLength": 1
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                },
                 "internalArea": {
                   "title": "Total internal floor area",
                   "type": "object",
@@ -498,59 +484,98 @@
                   "title": "Year the property was built",
                   "type": "integer"
                 },
-                "rooms": {
-                  "title": "Rooms",
-                  "description": "Information about the property's rooms",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "roomName": {
-                        "type": "string",
-                        "title": "The name of the room",
-                        "minLength": 1
-                      },
-                      "description": {
-                        "type": "string",
-                        "minLength": 1,
-                        "title": "The specific description of the room"
-                      },
-                      "length": {
-                        "type": "number",
-                        "minimum": 0,
-                        "title": "The length of the room"
-                      },
-                      "width": {
-                        "type": "number",
-                        "minimum": 0,
-                        "title": "The width of the room"
-                      },
-                      "units": {
-                        "title": "The units which the length and width of the room have been provided in",
-                        "type": "string",
-                        "enum": [
-                          "meters",
-                          "centimetres",
-                          "millimetres",
-                          "feet",
-                          "inches"
-                        ]
-                      },
-                      "dimensionDetails": {
-                        "title": "Any additional description or clarification of the room dimensions",
-                        "type": "string",
-                        "minLength": 1
-                      },
-                      "photoUrls": {
-                        "title": "The URLs of images which should be associated with this room",
-                        "type": "array",
-                        "items": {
-                          "type": "string",
-                          "format": "uri"
+                "isNewBuild": {
+                  "title": "Is the property a New Build?",
+                  "type": "object",
+                  "properties": {
+                    "yesNo": {
+                      "type": "string",
+                      "enum": [
+                        "Yes",
+                        "No"
+                      ]
+                    }
+                  }
+                },
+                "roomDimensions": {
+                  "title": "Room dimensions",
+                  "type": "object",
+                  "properties": {
+                    "hasFloorplan": {
+                      "title": "Is a floorplan available which includes the dimensions of all the rooms?",
+                      "type": "string",
+                      "enum": [
+                        "Yes",
+                        "No"
+                      ]
+                    }
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "hasFloorplan": {
+                          "enum": [
+                            "Yes"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "hasFloorplan": {
+                          "enum": [
+                            "No"
+                          ]
+                        },
+                        "rooms": {
+                          "title": "Rooms",
+                          "description": "Please supply dimensions for each of the rooms.",
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "roomName": {
+                                "type": "string",
+                                "title": "The name of the room",
+                                "minLength": 1
+                              },
+                              "description": {
+                                "type": "string",
+                                "minLength": 1,
+                                "title": "Description of the room"
+                              },
+                              "length": {
+                                "type": "number",
+                                "minimum": 0,
+                                "title": "The length of the room"
+                              },
+                              "width": {
+                                "type": "number",
+                                "minimum": 0,
+                                "title": "The width of the room"
+                              },
+                              "units": {
+                                "title": "The units which the length and width of the room have been provided in",
+                                "type": "string",
+                                "enum": [
+                                  "meters",
+                                  "centimetres",
+                                  "millimetres",
+                                  "feet",
+                                  "inches"
+                                ]
+                              },
+                              "dimensionDetails": {
+                                "title": "Any additional description or clarification of the room dimensions",
+                                "type": "string",
+                                "minLength": 1
+                              }
+                            }
+                          }
                         }
                       }
                     }
-                  }
+                  ]
                 }
               }
             },
@@ -938,144 +963,6 @@
                 }
               }
             },
-            "connectivity": {
-              "title": "Connectivity",
-              "type": "object",
-              "properties": {
-                "broadband": {
-                  "title": "Broadband predicted speed per Ofcom Connected Nations",
-                  "type": "object",
-                  "properties": {
-                    "MaxBbPredictedDown": {
-                      "type": "number"
-                    },
-                    "MaxBbPredictedUp": {
-                      "type": "number"
-                    },
-                    "MaxSfbbPredictedDown": {
-                      "type": "number"
-                    },
-                    "MaxSfbbPredictedUp": {
-                      "type": "number"
-                    },
-                    "MaxUfbbPredictedDown": {
-                      "type": "number"
-                    },
-                    "MaxUfbbPredictedUp": {
-                      "type": "number"
-                    },
-                    "MaxPredictedDown": {
-                      "type": "number"
-                    },
-                    "MaxPredictedUp": {
-                      "type": "number"
-                    }
-                  }
-                },
-                "mobile": {
-                  "title": "Mobile predicted coverage per Ofcom Connected Nations",
-                  "type": "object",
-                  "properties": {
-                    "EEVoiceOutdoor": {
-                      "type": "integer"
-                    },
-                    "EEVoiceOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "EEVoiceIndoor": {
-                      "type": "integer"
-                    },
-                    "EEVoiceIndoorNo4g": {
-                      "type": "integer"
-                    },
-                    "EEDataOutdoor": {
-                      "type": "integer"
-                    },
-                    "EEDataOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "EEDataIndoor": {
-                      "type": "integer"
-                    },
-                    "EEDataIndoorNo4g": {
-                      "type": "integer"
-                    },
-                    "H3VoiceOutdoor": {
-                      "type": "integer"
-                    },
-                    "H3VoiceOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "H3VoiceIndoor": {
-                      "type": "integer"
-                    },
-                    "H3VoiceIndoorNo4g": {
-                      "type": "integer"
-                    },
-                    "H3DataOutdoor": {
-                      "type": "integer"
-                    },
-                    "H3DataOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "H3DataIndoor": {
-                      "type": "integer"
-                    },
-                    "H3DataIndoorNo4g": {
-                      "type": "integer"
-                    },
-                    "TFVoiceOutdoor": {
-                      "type": "integer"
-                    },
-                    "TFVoiceOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "TFVoiceIndoor": {
-                      "type": "integer"
-                    },
-                    "TFVoiceIndoorNo4g": {
-                      "type": "integer"
-                    },
-                    "TFDataOutdoor": {
-                      "type": "integer"
-                    },
-                    "TFDataOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "TFDataIndoor": {
-                      "type": "integer"
-                    },
-                    "TFDataIndoorNo4g": {
-                      "type": "integer"
-                    },
-                    "VOVoiceOutdoor": {
-                      "type": "integer"
-                    },
-                    "VOVoiceOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "VOVoiceIndoor": {
-                      "type": "integer"
-                    },
-                    "VOVoiceIndoorNo4g": {
-                      "type": "integer"
-                    },
-                    "VODataOutdoor": {
-                      "type": "integer"
-                    },
-                    "VODataOutdoorNo4g": {
-                      "type": "integer"
-                    },
-                    "VODataIndoor": {
-                      "type": "integer"
-                    },
-                    "VODataIndoorNo4g": {
-                      "type": "integer"
-                    }
-                  }
-                }
-              }
-            },
             "delayFactors": {
               "title": "Delay factors",
               "type": "object",
@@ -1574,13 +1461,11 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": [
-                                                "true",
-                                                "false"
-                                              ]
-                                            }
+                                            "type": "string",
+                                            "enum": [
+                                              "true",
+                                              "false"
+                                            ]
                                           }
                                         },
                                         "oneOf": [
@@ -1616,13 +1501,11 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": [
-                                                "true",
-                                                "false"
-                                              ]
-                                            }
+                                            "type": "string",
+                                            "enum": [
+                                              "true",
+                                              "false"
+                                            ]
                                           }
                                         },
                                         "oneOf": [
@@ -1658,13 +1541,11 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": [
-                                                "true",
-                                                "false"
-                                              ]
-                                            }
+                                            "type": "string",
+                                            "enum": [
+                                              "true",
+                                              "false"
+                                            ]
                                           }
                                         },
                                         "oneOf": [
@@ -1700,13 +1581,11 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": [
-                                                "true",
-                                                "false"
-                                              ]
-                                            }
+                                            "type": "string",
+                                            "enum": [
+                                              "true",
+                                              "false"
+                                            ]
                                           }
                                         },
                                         "oneOf": [
@@ -1741,13 +1620,11 @@
                                         "type": "object",
                                         "properties": {
                                           "isApplicableParty": {
-                                            "isApplicableParty": {
-                                              "type": "string",
-                                              "enum": [
-                                                "true",
-                                                "false"
-                                              ]
-                                            }
+                                            "type": "string",
+                                            "enum": [
+                                              "true",
+                                              "false"
+                                            ]
                                           }
                                         },
                                         "oneOf": [
@@ -3806,13 +3683,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -3848,13 +3723,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -3889,13 +3762,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -3991,13 +3862,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -4033,13 +3902,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -4075,13 +3942,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -4117,13 +3982,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -4158,13 +4021,11 @@
                                             "type": "object",
                                             "properties": {
                                               "isApplicableParty": {
-                                                "isApplicableParty": {
-                                                  "type": "string",
-                                                  "enum": [
-                                                    "true",
-                                                    "false"
-                                                  ]
-                                                }
+                                                "type": "string",
+                                                "enum": [
+                                                  "true",
+                                                  "false"
+                                                ]
                                               }
                                             },
                                             "oneOf": [
@@ -6963,12 +6824,25 @@
                       "On Street",
                       "Rear",
                       "Private",
-                      "Disabled Parking Available",
-                      "No Disabled Parking Available",
                       "Garage En Bloc"
                     ]
                   }
                 },
+                "disabledParking": {
+                  "title": "Is disabled parking available?",
+                  "type": "object",
+                  "properties": {
+                    "yesNo": {
+                      "type": "string",
+                      "title": "",
+                      "enum": [
+                        "Yes",
+                        "No",
+                        "Not known"
+                      ]
+                    }
+                  }
+                },
                 "controlledParking": {
                   "title": "Is the property in a controlled parking zone or within a local authority parking scheme?",
                   "type": "object",
@@ -7037,7 +6911,7 @@
                           ]
                         },
                         "details": {
-                          "title": "Please provide details of the listing and any relevant documents",
+                          "title": "Please provide details of the listing",
                           "type": "string",
                           "minLength": 1
                         },
@@ -7086,7 +6960,7 @@
                           ]
                         },
                         "details": {
-                          "title": "Please provide details of the listing and any relevant documents",
+                          "title": "Please provide details of the listing",
                           "type": "string",
                           "minLength": 1
                         },
@@ -7196,8 +7070,8 @@
               "type": "object",
               "properties": {
                 "isStandardForm": {
-                  "title": "Is the property built in a standard form of construction? E.g. brick and/or block with timber-supported roof comprising a tile or slate cover?",
-                  "description": "Examples of non-standard features which might affect a buyer are are thatched roofs, prefabricated buildings or timber-framed windows",
+                  "title": "Is the property built in a standard form of construction?",
+                  "description": "Standard construction is brick and/or block with timber-supported roof comprising a tile or slate cover. Examples of non-standard features which might affect a buyer are are thatched roofs, prefabricated buildings or timber-framed windows.",
                   "type": "object",
                   "properties": {
                     "yesNo": {
@@ -7354,7 +7228,7 @@
                 },
                 "accessibilityAndAdaptations": {
                   "title": "Are there any adaptations or features that provide easier access to, and within, the property?",
-                  "description": "Lateral living is a term used to describe a property that has essential facilites on the entrance level",
+                  "description": "Lateral living is where a property has all essential facilities e.g. kitchen, bathroom and bedroom on the entrance level.",
                   "type": "array",
                   "items": {
                     "type": "string",
@@ -15786,9 +15660,8 @@
                 }
               }
             },
-            "connectedUtilities": {
-              "title": "Connected utilities",
-              "description": "Please indicate which utilities are are connected to the property.",
+            "electricity": {
+              "title": "Electricity supply",
               "type": "object",
               "properties": {
                 "mainsElectricity": {
@@ -15805,187 +15678,6 @@
                       ]
                     }
                   },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        },
-                        "mpan": {
-                          "title": "Meter Point Administration Number (MPAN)",
-                          "description": "Your MPAN is on your electricity or dual fuel bill, usually in a box marked ‘Supply Number’. It’s 21 digits long and begins with ‘S’. You’ll only need the last 12 or 13 digits.",
-                          "type": "integer"
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "title": "Date to be connected",
-                          "type": "string",
-                          "format": "date"
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  ]
-                },
-                "mainsGas": {
-                  "title": "Mains gas",
-                  "type": "object",
-                  "properties": {
-                    "yesNo": {
-                      "type": "string",
-                      "title": "",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        },
-                        "mprn": {
-                          "title": "Meter Point Reference Number (MPRN)",
-                          "description": "You can find your property’s MPRN on your gas or dual fuel bill. It’s usually marked ‘Meter Point Reference Number’ and is between six and 10 digits long.",
-                          "type": "integer"
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "title": "Date to be connected",
-                          "type": "string",
-                          "format": "date"
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  ]
-                },
-                "lpg": {
-                  "title": "Liquid Petroleum Gas (LPG)",
-                  "type": "object",
-                  "properties": {
-                    "yesNo": {
-                      "type": "string",
-                      "title": "",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "title": "Date to be connected",
-                          "type": "string",
-                          "format": "date"
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  ]
-                },
-                "oil": {
-                  "title": "Oil",
-                  "type": "object",
-                  "properties": {
-                    "yesNo": {
-                      "type": "string",
-                      "title": "",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  },
                   "oneOf": [
                     {
                       "properties": {
@@ -16029,187 +15721,6 @@
                     }
                   ]
                 },
-                "telephone": {
-                  "title": "Telephone",
-                  "type": "object",
-                  "properties": {
-                    "yesNo": {
-                      "type": "string",
-                      "title": "",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "title": "Date to be connected",
-                          "type": "string",
-                          "format": "date"
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  ]
-                },
-                "cableSatelliteTV": {
-                  "title": "Cable TV or satellite",
-                  "type": "object",
-                  "properties": {
-                    "yesNo": {
-                      "type": "string",
-                      "title": "",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "title": "Date to be connected",
-                          "type": "string",
-                          "format": "date"
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  ]
-                },
-                "broadband": {
-                  "title": "Broadband",
-                  "type": "object",
-                  "properties": {
-                    "yesNo": {
-                      "type": "string",
-                      "title": "",
-                      "enum": [
-                        "Yes",
-                        "To be connected",
-                        "No"
-                      ]
-                    }
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        },
-                        "typeOfConnection": {
-                          "title": "Type of connection",
-                          "type": "string",
-                          "enum": [
-                            "ADSL copper wire",
-                            "Cable",
-                            "FTTC (Fibre to the Cabinet)",
-                            "FTTP (Fibre to the Premises)"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "To be connected"
-                          ]
-                        },
-                        "dateToBeConnected": {
-                          "title": "Date to be connected",
-                          "type": "string",
-                          "format": "date"
-                        },
-                        "supplier": {
-                          "title": "Supplier",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  ]
-                },
                 "solarPanels": {
                   "title": "Solar or photovoltaic panels",
                   "type": "object",
@@ -16267,9 +15778,9 @@
                     }
                   ]
                 },
-                "otherServices": {
-                  "title": "Other services",
-                  "description": "Other services include wind turbines, generators and other renewable technologies, for example ground source heat pumps. If you receive Renewable Heat Incentives please provide details and note that you will need to advise Ofgem when you complete the sale",
+                "otherSources": {
+                  "title": "Other sources",
+                  "description": "Other sources include wind turbines, generators and other renewable technologies, for example ground source heat pumps. If you receive Renewable Heat Incentives please provide details and note that you will need to advise Ofgem when you complete the sale",
                   "type": "object",
                   "properties": {
                     "yesNo": {
@@ -16300,7 +15811,7 @@
                           ]
                         },
                         "details": {
-                          "title": "Supplier",
+                          "title": "Details",
                           "type": "string"
                         },
                         "supplier": {
@@ -16316,6 +15827,10 @@
                             "To be connected"
                           ]
                         },
+                        "details": {
+                          "title": "Details",
+                          "type": "string"
+                        },
                         "dateToBeConnected": {
                           "title": "Date to be connected",
                           "type": "string",
@@ -16328,53 +15843,6 @@
                       }
                     }
                   ]
-                },
-                "maintenanceAgreements": {
-                  "title": "Do you have any licences, maintenance agreements, contracts or service agreements in relation to connected services?",
-                  "type": "object",
-                  "properties": {
-                    "yesNo": {
-                      "type": "string",
-                      "title": "",
-                      "enum": [
-                        "Yes",
-                        "No"
-                      ]
-                    }
-                  },
-                  "oneOf": [
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "No"
-                          ]
-                        }
-                      }
-                    },
-                    {
-                      "properties": {
-                        "yesNo": {
-                          "enum": [
-                            "Yes"
-                          ]
-                        },
-                        "details": {
-                          "title": "Details",
-                          "type": "string",
-                          "minLength": 1
-                        },
-                        "attachments": {
-                          "title": "Attachments",
-                          "type": "string",
-                          "enum": [
-                            "Attached",
-                            "To follow"
-                          ]
-                        }
-                      }
-                    }
-                  ]
                 }
               }
             },
@@ -16450,9 +15918,12 @@
                               "minLength": 1
                             },
                             "isSupplyMetered": {
-                              "title": "Details",
+                              "title": "Is the supply metered?",
                               "type": "string",
-                              "minLength": 1
+                              "enum": [
+                                "Yes",
+                                "No"
+                              ]
                             }
                           }
                         },
@@ -16642,10 +16113,6 @@
                                 "Yes"
                               ]
                             },
-                            "supplier": {
-                              "title": "Supplier",
-                              "type": "string"
-                            },
                             "details": {
                               "title": "Details",
                               "type": "string",
@@ -16664,17 +16131,13 @@
                               "title": "Date to be connected",
                               "type": "string",
                               "format": "date"
-                            },
-                            "supplier": {
-                              "title": "Supplier",
-                              "type": "string"
                             }
                           }
                         }
                       ]
                     },
                     "mainsFoulDrainage": {
-                      "title": "Mains foul drainage / sweerage",
+                      "title": "Mains foul drainage / sewerage",
                       "type": "object",
                       "properties": {
                         "yesNo": {
@@ -16696,11 +16159,6 @@
                                 "Yes"
                               ]
                             },
-                            "supplier": {
-                              "title": "Supplier",
-                              "type": "string",
-                              "minLength": 1
-                            },
                             "details": {
                               "title": "Details",
                               "type": "string",
@@ -16734,91 +16192,205 @@
                                 "Not known"
                               ]
                             },
-                            "sustainableDrainageSystem": {
-                              "title": "Sustainable Drainage System",
+                            "offMainsDrainageSystem": {
                               "type": "object",
                               "properties": {
-                                "yesNo": {
+                                "offMainsDrainageSystemType": {
                                   "type": "string",
-                                  "title": "",
                                   "enum": [
-                                    "Yes",
-                                    "To be connected",
-                                    "No"
+                                    "Sustainable Drainage System",
+                                    "Septic tank",
+                                    "Cesspit",
+                                    "Sewerage treatment plant",
+                                    "Other",
+                                    "Not known"
                                   ]
-                                }
-                              },
-                              "oneOf": [
-                                {
+                                },
+                                "otherConnectedProperties": {
+                                  "title": "Do other properties connect to the septic tank, cesspit or sewerage treatment plant?",
+                                  "type": "object",
                                   "properties": {
                                     "yesNo": {
+                                      "type": "string",
+                                      "title": "",
                                       "enum": [
+                                        "Yes",
                                         "No"
                                       ]
                                     }
-                                  }
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "No"
+                                          ]
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "Yes"
+                                          ]
+                                        },
+                                        "numberOfPropertiesSharing": {
+                                          "title": "How many other properties?",
+                                          "type": "integer"
+                                        },
+                                        "details": {
+                                          "title": "Provide details of the properties sharing the system and explain how maintenance of the system is arranged and paid for",
+                                          "type": "string",
+                                          "minLength": 1
+                                        }
+                                      }
+                                    }
+                                  ]
                                 },
-                                {
+                                "plantOnOtherLand": {
+                                  "title": "Is any part of the septic tank, cesspit or sewerage treatment plant located on someone else’s land?",
+                                  "type": "object",
                                   "properties": {
                                     "yesNo": {
+                                      "type": "string",
+                                      "title": "",
                                       "enum": [
-                                        "Yes"
+                                        "Yes",
+                                        "No"
                                       ]
+                                    }
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "No"
+                                          ]
+                                        }
+                                      }
                                     },
-                                    "supplier": {
-                                      "title": "Supplier",
-                                      "type": "string"
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "Yes"
+                                          ]
+                                        },
+                                        "attachments": {
+                                          "title": "Please supply a plan showing the location of the system and how access is obtained.",
+                                          "type": "string",
+                                          "enum": [
+                                            "Attached",
+                                            "To follow"
+                                          ]
+                                        }
+                                      }
                                     }
-                                  }
+                                  ]
                                 },
-                                {
+                                "plantRegistered": {
+                                  "title": "Is the septic tank, cesspit or sewerage treatment plant registered with the Environment Agency or exempted?",
+                                  "type": "object",
                                   "properties": {
                                     "yesNo": {
+                                      "type": "string",
+                                      "title": "",
                                       "enum": [
-                                        "To be connected"
+                                        "Yes",
+                                        "No"
                                       ]
+                                    }
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "No"
+                                          ]
+                                        }
+                                      }
                                     },
-                                    "dateToBeConnected": {
-                                      "title": "Date to be connected",
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "Yes"
+                                          ]
+                                        },
+                                        "attachments": {
+                                          "title": "Please supply the appropriate permit to discharge or exemption certificate",
+                                          "type": "string",
+                                          "enum": [
+                                            "Attached",
+                                            "To follow"
+                                          ]
+                                        }
+                                      }
+                                    }
+                                  ]
+                                },
+                                "plantDrainsIntoWaterway": {
+                                  "title": "Does the septic tank, cesspit or sewerage treatment plant drain into a waterway (lake, river, stream etc)",
+                                  "type": "object",
+                                  "properties": {
+                                    "yesNo": {
                                       "type": "string",
-                                      "format": "date"
+                                      "title": "",
+                                      "enum": [
+                                        "Yes",
+                                        "No, the effluent is discharged through a soakaway system."
+                                      ]
+                                    }
+                                  },
+                                  "oneOf": [
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "No, the effluent is discharged through a soakaway system."
+                                          ]
+                                        }
+                                      }
                                     },
-                                    "supplier": {
-                                      "title": "Supplier",
-                                      "type": "string"
+                                    {
+                                      "properties": {
+                                        "yesNo": {
+                                          "enum": [
+                                            "Yes"
+                                          ]
+                                        },
+                                        "dischargeCompliesWithGBR": {
+                                          "title": "Does it comply with the General Binding Rules for discharge into a waterway?",
+                                          "type": "string",
+                                          "enum": [
+                                            "Yes",
+                                            "No"
+                                          ]
+                                        }
+                                      }
                                     }
-                                  }
-                                }
-                              ]
-                            },
-                            "septicTank": {
-                              "title": "Septic tank",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No"
                                   ]
                                 }
                               },
                               "oneOf": [
                                 {
                                   "properties": {
-                                    "yesNo": {
+                                    "offMainsDrainageSystemType": {
                                       "enum": [
-                                        "No"
+                                        "Sustainable Drainage System"
                                       ]
                                     }
                                   }
                                 },
                                 {
                                   "properties": {
-                                    "yesNo": {
+                                    "offMainsDrainageSystemType": {
                                       "enum": [
-                                        "Yes"
+                                        "Septic tank"
                                       ]
                                     },
                                     "dateReplaced": {
@@ -16832,37 +16404,12 @@
                                       "format": "date"
                                     }
                                   }
-                                }
-                              ]
-                            },
-                            "cesspit": {
-                              "title": "Cesspit",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No"
-                                  ]
-                                }
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "No"
-                                      ]
-                                    }
-                                  }
                                 },
                                 {
                                   "properties": {
-                                    "yesNo": {
+                                    "offMainsDrainageSystemType": {
                                       "enum": [
-                                        "Yes"
+                                        "Cesspit"
                                       ]
                                     },
                                     "dateLastEmptied": {
@@ -16871,37 +16418,12 @@
                                       "format": "date"
                                     }
                                   }
-                                }
-                              ]
-                            },
-                            "sewerageTreatmentPlant": {
-                              "title": "Sewerage treatment plant",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No"
-                                  ]
-                                }
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "No"
-                                      ]
-                                    }
-                                  }
                                 },
                                 {
                                   "properties": {
-                                    "yesNo": {
+                                    "offMainsDrainageSystemType": {
                                       "enum": [
-                                        "Yes"
+                                        "Sewerage treatment plant"
                                       ]
                                     },
                                     "dateInstalled": {
@@ -16924,173 +16446,18 @@
                                       ]
                                     }
                                   }
-                                }
-                              ]
-                            },
-                            "otherConnectedProperties": {
-                              "title": "Do other properties connect to the septic tank, cesspit or sewerage treatment plant?",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No"
-                                  ]
-                                }
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "No"
-                                      ]
-                                    }
-                                  }
                                 },
                                 {
                                   "properties": {
-                                    "yesNo": {
+                                    "offMainsDrainageSystemType": {
                                       "enum": [
-                                        "Yes"
+                                        "Other",
+                                        "Not known"
                                       ]
                                     },
-                                    "numberOfPropertiesSharing": {
-                                      "title": "How many other properties?",
-                                      "type": "integer"
-                                    },
                                     "details": {
-                                      "title": "Provide details of the properties sharing the system and explain how maintenance of the system is arranged and paid for",
-                                      "type": "string",
-                                      "minLength": 1
-                                    }
-                                  }
-                                }
-                              ]
-                            },
-                            "plantOnOtherLand": {
-                              "title": "Is any part of the septic tank, cesspit or sewerage treatment plant located on someone else’s land?",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No"
-                                  ]
-                                }
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "No"
-                                      ]
-                                    }
-                                  }
-                                },
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "Yes"
-                                      ]
-                                    },
-                                    "attachments": {
-                                      "title": "Please supply a plan showing the location of the system and how access is obtained.",
-                                      "type": "string",
-                                      "enum": [
-                                        "Attached",
-                                        "To follow"
-                                      ]
-                                    }
-                                  }
-                                }
-                              ]
-                            },
-                            "plantRegistered": {
-                              "title": "Is the septic tank, cesspit or sewerage treatment plant registered with the Environment Agency or exempted?",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No"
-                                  ]
-                                }
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "No"
-                                      ]
-                                    }
-                                  }
-                                },
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "Yes"
-                                      ]
-                                    },
-                                    "attachments": {
-                                      "title": "Please supply the appropriate permit to discharge or exemption certificate",
-                                      "type": "string",
-                                      "enum": [
-                                        "Attached",
-                                        "To follow"
-                                      ]
-                                    }
-                                  }
-                                }
-                              ]
-                            },
-                            "plantDrainsIntoWaterway": {
-                              "title": "Does the septic tank, cesspit or sewerage treatment plant drain into a waterway (lake, river, stream etc)",
-                              "type": "object",
-                              "properties": {
-                                "yesNo": {
-                                  "type": "string",
-                                  "title": "",
-                                  "enum": [
-                                    "Yes",
-                                    "No, the effluent is discharged through a soakaway system."
-                                  ]
-                                }
-                              },
-                              "oneOf": [
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "No, the effluent is discharged through a soakaway system."
-                                      ]
-                                    }
-                                  }
-                                },
-                                {
-                                  "properties": {
-                                    "yesNo": {
-                                      "enum": [
-                                        "Yes"
-                                      ]
-                                    },
-                                    "dischargeCompliesWithGBR": {
-                                      "title": "Does it comply with the General Binding Rules for discharge into a waterway?",
-                                      "type": "string",
-                                      "enum": [
-                                        "Yes",
-                                        "No, it does not comply with the rules for discharge into a waterway."
-                                      ]
+                                      "title": "Details",
+                                      "type": "string"
                                     }
                                   }
                                 }
@@ -17506,223 +16873,547 @@
               "title": "Heating",
               "type": "object",
               "properties": {
-                "heatingType": {
-                  "title": "What type of heating system does the property have?",
-                  "type": "string",
-                  "enum": [
-                    "Central heating",
-                    "Communal heating system",
-                    "None"
-                  ]
-                },
-                "otherHeatingFeatures": {
-                  "title": "What other heating features does the property have?",
-                  "type": "array",
-                  "items": {
-                    "type": "string",
-                    "enum": [
-                      "Air Conditioning",
-                      "Double Glazing",
-                      "Eco-Friendly",
-                      "Night Storage",
-                      "Solar Water",
-                      "Underfloor Heating",
-                      "Wood Burner",
-                      "Open Fire",
-                      "Ground Source Heat Pump",
-                      "Air Source Heat Pump",
-                      "Solar Thermal"
-                    ]
-                  }
-                }
-              },
-              "oneOf": [
-                {
+                "heatingSystem": {
+                  "type": "object",
+                  "title": "Heating system",
                   "properties": {
                     "heatingType": {
+                      "title": "What type of heating system does the property have?",
+                      "type": "string",
                       "enum": [
+                        "Central heating",
+                        "Communal heating system",
+                        "Room heaters only",
                         "None"
                       ]
                     }
-                  }
-                },
-                {
-                  "properties": {
-                    "heatingType": {
-                      "enum": [
-                        "Central heating"
-                      ]
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "heatingType": {
+                          "enum": [
+                            "None",
+                            "Room heaters only"
+                          ]
+                        }
+                      }
                     },
-                    "centralHeatingDetails": {
-                      "type": "object",
-                      "title": "Central Heating Details",
+                    {
                       "properties": {
-                        "centralHeatingFuel": {
+                        "heatingType": {
+                          "enum": [
+                            "Central heating"
+                          ]
+                        },
+                        "centralHeatingDetails": {
                           "type": "object",
-                          "title": "Central Heating Fuel",
+                          "title": "Central Heating Details",
                           "properties": {
-                            "centralHeatingFuelType": {
-                              "title": "What type of fuel does the system run on?",
-                              "type": "string",
-                              "enum": [
-                                "Mains gas",
-                                "Electricity",
-                                "Oil",
-                                "LPG",
-                                "Other"
-                              ]
-                            }
-                          },
-                          "oneOf": [
-                            {
+                            "centralHeatingFuel": {
+                              "type": "object",
+                              "title": "Central Heating Fuel",
                               "properties": {
                                 "centralHeatingFuelType": {
+                                  "title": "What type of fuel does the system run on?",
+                                  "type": "string",
                                   "enum": [
                                     "Mains gas",
                                     "Electricity",
                                     "Oil",
                                     "LPG",
-                                    "Biomass boiler"
+                                    "Biomass",
+                                    "Other"
                                   ]
                                 }
-                              }
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "centralHeatingFuelType": {
+                                      "enum": [
+                                        "Mains gas",
+                                        "Electricity",
+                                        "Oil",
+                                        "LPG",
+                                        "Biomass"
+                                      ]
+                                    }
+                                  }
+                                },
+                                {
+                                  "properties": {
+                                    "centralHeatingFuelType": {
+                                      "enum": [
+                                        "Other"
+                                      ]
+                                    },
+                                    "otherCentralHeatingFuelType": {
+                                      "title": "Please describe the other fuel type",
+                                      "type": "string",
+                                      "minLength": 1
+                                    }
+                                  }
+                                }
+                              ]
                             },
-                            {
+                            "centralHeatingInstalled": {
+                              "title": "When was the heating system installed?",
+                              "type": "string",
+                              "format": "date"
+                            },
+                            "boilerInstallationCertificate": {
+                              "title": "Was a gas boiler installed after 1st April 2005, or a solid fuel or oil boiler installed after 1st October 2010?",
+                              "type": "object",
                               "properties": {
-                                "centralHeatingFuelType": {
+                                "yesNo": {
+                                  "type": "string",
+                                  "title": "",
                                   "enum": [
-                                    "Other"
+                                    "Yes",
+                                    "No"
                                   ]
+                                }
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    }
+                                  }
                                 },
-                                "otherCentralHeatingFuelType": {
-                                  "title": "Please describe the other fuel type",
-                                  "type": "string",
-                                  "minLength": 1
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    },
+                                    "attachments": {
+                                      "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",
+                                      "type": "string",
+                                      "enum": [
+                                        "Attached",
+                                        "To follow"
+                                      ]
+                                    }
+                                  }
                                 }
-                              }
-                            }
-                          ]
-                        },
-                        "centralHeatingInstalled": {
-                          "title": "When was the heating system installed?",
-                          "type": "string",
-                          "format": "date"
-                        },
-                        "boilerInstallationCertificate": {
-                          "title": "Was a gas boiler installed after 1st April 2005, or a solid fuel or oil boiler installed after 1st October 2010?",
-                          "type": "object",
-                          "properties": {
-                            "yesNo": {
+                              ]
+                            },
+                            "heatingLastServicedDate": {
+                              "title": "When was the heating system last serviced or maintained?",
+                              "type": "string",
+                              "format": "date"
+                            },
+                            "heatingLastServicedReport": {
+                              "title": "Please provide a copy of the service or maintenance works report.",
                               "type": "string",
-                              "title": "",
                               "enum": [
-                                "Yes",
-                                "No"
+                                "Attached",
+                                "To follow",
+                                "Not available"
                               ]
-                            }
-                          },
-                          "oneOf": [
-                            {
+                            },
+                            "heatingInGoodWorkingOrder": {
+                              "title": "Is the heating system in good working order to your satisfaction?",
+                              "type": "object",
                               "properties": {
                                 "yesNo": {
+                                  "type": "string",
+                                  "title": "",
                                   "enum": [
+                                    "Yes",
                                     "No"
                                   ]
                                 }
-                              }
-                            },
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "Yes"
-                                  ]
+                              },
+                              "oneOf": [
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "Yes"
+                                      ]
+                                    }
+                                  }
                                 },
-                                "attachments": {
-                                  "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",
-                                  "type": "string",
-                                  "enum": [
-                                    "Attached",
-                                    "To follow"
-                                  ]
+                                {
+                                  "properties": {
+                                    "yesNo": {
+                                      "enum": [
+                                        "No"
+                                      ]
+                                    },
+                                    "details": {
+                                      "title": "Please provide details",
+                                      "type": "string",
+                                      "minLength": 1
+                                    }
+                                  }
                                 }
-                              }
+                              ]
                             }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "heatingType": {
+                          "enum": [
+                            "Community heating system"
                           ]
                         },
-                        "heatingLastServicedDate": {
-                          "title": "When was the heating system last serviced or maintained?",
+                        "details": {
+                          "title": "Community heating system details",
+                          "description": "Please describe how the cost of heating supply is charged, whether you have control over the energy supplier and whether you have any control over the heating.",
                           "type": "string",
-                          "format": "date"
+                          "minLength": 1
+                        }
+                      }
+                    }
+                  ]
+                },
+                "otherHeatingFeatures": {
+                  "title": "What other heating features does the property have?",
+                  "type": "array",
+                  "items": {
+                    "type": "string",
+                    "enum": [
+                      "Air conditioning",
+                      "Double glazing",
+                      "Triple glazing",
+                      "Night storage",
+                      "Solar water",
+                      "Underfloor heating",
+                      "Wood burner",
+                      "Open fire",
+                      "Ground source heat pump",
+                      "Air source heat pump",
+                      "Solar thermal",
+                      "Passive House design"
+                    ]
+                  }
+                }
+              }
+            },
+            "connectivity": {
+              "title": "Connectivity",
+              "type": "object",
+              "properties": {
+                "telephone": {
+                  "title": "Telephone",
+                  "type": "object",
+                  "properties": {
+                    "yesNo": {
+                      "type": "string",
+                      "title": "",
+                      "enum": [
+                        "Yes",
+                        "To be connected",
+                        "No"
+                      ]
+                    }
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
+                          ]
                         },
-                        "heatingLastServicedReport": {
-                          "title": "Please provide a copy of the service or maintenance works report.",
+                        "supplier": {
+                          "title": "Supplier",
+                          "type": "string"
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "To be connected"
+                          ]
+                        },
+                        "dateToBeConnected": {
+                          "title": "Date to be connected",
                           "type": "string",
+                          "format": "date"
+                        },
+                        "supplier": {
+                          "title": "Supplier",
+                          "type": "string"
+                        }
+                      }
+                    }
+                  ]
+                },
+                "cableSatelliteTV": {
+                  "title": "Cable TV or satellite",
+                  "type": "object",
+                  "properties": {
+                    "yesNo": {
+                      "type": "string",
+                      "title": "",
+                      "enum": [
+                        "Yes",
+                        "To be connected",
+                        "No"
+                      ]
+                    }
+                  },
+                  "oneOf": [
+                    {
+                      "properties": {
+                        "yesNo": {
                           "enum": [
-                            "Attached",
-                            "To follow",
-                            "Not available"
+                            "No"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "Yes"
                           ]
                         },
-                        "heatingInGoodWorkingOrder": {
-                          "title": "Is the heating system in good working order to your satisfaction?",
-                          "type": "object",
+                        "supplier": {
+                          "title": "Supplier",
+                          "type": "string"
+                        }
+                      }
+                    },
+                    {
+                      "properties": {
+                        "yesNo": {
+                          "enum": [
+                            "To be connected"
+                          ]
+                        },
+                        "dateToBeConnected": {
+                          "title": "Date to be connected",
+                          "type": "string",
+                          "format": "date"
+                        },
+                        "supplier": {
+                          "title": "Supplier",
+                          "type": "string"
+                        }
+                      }
+                    }
+                  ]
+                },
+                "broadband": {
+                  "title": "Broadband",
+                  "type": "object",
+                  "properties": {
+                    "typeOfConnection": {
+                      "title": "Type of connection",
+                      "type": "string",
+                      "enum": [
+                        "None",
+                        "ADSL copper wire",
+                        "Cable",
+                        "FTTC (Fibre to the Cabinet)",
+                        "FTTP (Fibre to the Premises)"
+                      ]
+                    },
+                    "predictedSpeed": {
+                      "title": "Broadband predicted speed per Ofcom Connected Nations",
+                      "type": "object",
+                      "properties": {
+                        "MaxBbPredictedDown": {
+                          "type": "number"
+                        },
+                        "MaxBbPredictedUp": {
+                          "type": "number"
+                        },
+                        "MaxSfbbPredictedDown": {
+                          "type": "number"
+                        },
+                        "MaxSfbbPredictedUp": {
+                          "type": "number"
+                        },
+                        "MaxUfbbPredictedDown": {
+                          "type": "number"
+                        },
+                        "MaxUfbbPredictedUp": {
+                          "type": "number"
+                        },
+                        "MaxPredictedDown": {
+                          "type": "number"
+                        },
+                        "MaxPredictedUp": {
+                          "type": "number"
+                        }
+                      }
+                    }
+                  }
+                },
+                "mobilePhone": {
+                  "title": "Mobile phone coverage",
+                  "type": "object",
+                  "properties": {
+                    "knownSignalIssues": {
+                      "title": "Are there any issues with mobile phone signal or coverage at the property?",
+                      "description": "You should disclose any known issues with signal strength or dropped calls specific to the property.",
+                      "type": "object",
+                      "properties": {
+                        "yesNo": {
+                          "title": "",
+                          "type": "string",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      },
+                      "oneOf": [
+                        {
                           "properties": {
                             "yesNo": {
-                              "type": "string",
-                              "title": "",
                               "enum": [
-                                "Yes",
                                 "No"
                               ]
                             }
-                          },
-                          "oneOf": [
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "Yes"
-                                  ]
-                                }
-                              }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
                             },
-                            {
-                              "properties": {
-                                "yesNo": {
-                                  "enum": [
-                                    "No"
-                                  ]
-                                },
-                                "details": {
-                                  "title": "Please provide details",
-                                  "type": "string",
-                                  "minLength": 1
-                                }
-                              }
+                            "details": {
+                              "title": "Details",
+                              "type": "string"
                             }
-                          ]
+                          }
                         }
-                      }
-                    }
-                  }
-                },
-                {
-                  "properties": {
-                    "heatingType": {
-                      "enum": [
-                        "Community heating system"
                       ]
                     },
-                    "details": {
-                      "title": "Community heating system details",
-                      "description": "Please descripbe how the cost of heating supply is charged, whether you have control over the energy supplier and whether you have any control over the heating",
-                      "type": "string",
-                      "minLength": 1
+                    "predictedCoverage": {
+                      "title": "Mobile predicted coverage per Ofcom Connected Nations",
+                      "type": "object",
+                      "properties": {
+                        "EEVoiceOutdoor": {
+                          "type": "integer"
+                        },
+                        "EEVoiceOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "EEVoiceIndoor": {
+                          "type": "integer"
+                        },
+                        "EEVoiceIndoorNo4g": {
+                          "type": "integer"
+                        },
+                        "EEDataOutdoor": {
+                          "type": "integer"
+                        },
+                        "EEDataOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "EEDataIndoor": {
+                          "type": "integer"
+                        },
+                        "EEDataIndoorNo4g": {
+                          "type": "integer"
+                        },
+                        "H3VoiceOutdoor": {
+                          "type": "integer"
+                        },
+                        "H3VoiceOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "H3VoiceIndoor": {
+                          "type": "integer"
+                        },
+                        "H3VoiceIndoorNo4g": {
+                          "type": "integer"
+                        },
+                        "H3DataOutdoor": {
+                          "type": "integer"
+                        },
+                        "H3DataOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "H3DataIndoor": {
+                          "type": "integer"
+                        },
+                        "H3DataIndoorNo4g": {
+                          "type": "integer"
+                        },
+                        "TFVoiceOutdoor": {
+                          "type": "integer"
+                        },
+                        "TFVoiceOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "TFVoiceIndoor": {
+                          "type": "integer"
+                        },
+                        "TFVoiceIndoorNo4g": {
+                          "type": "integer"
+                        },
+                        "TFDataOutdoor": {
+                          "type": "integer"
+                        },
+                        "TFDataOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "TFDataIndoor": {
+                          "type": "integer"
+                        },
+                        "TFDataIndoorNo4g": {
+                          "type": "integer"
+                        },
+                        "VOVoiceOutdoor": {
+                          "type": "integer"
+                        },
+                        "VOVoiceOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "VOVoiceIndoor": {
+                          "type": "integer"
+                        },
+                        "VOVoiceIndoorNo4g": {
+                          "type": "integer"
+                        },
+                        "VODataOutdoor": {
+                          "type": "integer"
+                        },
+                        "VODataOutdoorNo4g": {
+                          "type": "integer"
+                        },
+                        "VODataIndoor": {
+                          "type": "integer"
+                        },
+                        "VODataIndoorNo4g": {
+                          "type": "integer"
+                        }
+                      }
                     }
                   }
                 }
-              ]
+              }
             },
             "insurance": {
               "title": "Insurance",
@@ -18308,12 +17999,12 @@
                               ]
                             },
                             "details": {
-                              "title": "Please provide details and mark the route on a plan of the property",
+                              "title": "Please provide details",
                               "type": "string",
                               "minLength": 1
                             },
                             "attachments": {
-                              "title": "Attachments",
+                              "title": "Please mark the route on a plan of the property",
                               "type": "string",
                               "enum": [
                                 "Attached",
@@ -18613,7 +18304,7 @@
                       "title": "Flood Risk",
                       "type": "object",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": [
@@ -18625,7 +18316,7 @@
                       "oneOf": [
                         {
                           "properties": {
-                            "impactIndicator": {
+                            "riskIndicator": {
                               "enum": [
                                 "No"
                               ]
@@ -18634,21 +18325,21 @@
                         },
                         {
                           "properties": {
-                            "impactIndicator": {
+                            "riskIndicator": {
                               "enum": [
                                 "Yes"
                               ]
                             },
                             "actionAlertRating": {
-                              "type": "string",
+                              "type": "integer",
                               "title": "Action alert rating (1 is Green, 5 is Red)",
-                              "enum": [
-                                "1",
-                                "2",
-                                "3",
-                                "4",
-                                "5"
-                              ]
+                              "minimum": 1,
+                              "maximum": 5
+                            },
+                            "result": {
+                              "title": "Result",
+                              "type": "string",
+                              "minLength": 1
                             },
                             "summary": {
                               "type": "string",
@@ -18676,7 +18367,7 @@
                                     "type": "string",
                                     "title": "Risk sub-category name"
                                   },
-                                  "impactIndicator": {
+                                  "riskIndicator": {
                                     "type": "string",
                                     "title": "Is action recommended?",
                                     "enum": [
@@ -18685,15 +18376,15 @@
                                     ]
                                   },
                                   "actionAlertRating": {
-                                    "type": "string",
+                                    "type": "integer",
                                     "title": "Action alert rating (1 is Green, 5 is Red)",
-                                    "enum": [
-                                      "1",
-                                      "2",
-                                      "3",
-                                      "4",
-                                      "5"
-                                    ]
+                                    "minimum": 1,
+                                    "maximum": 5
+                                  },
+                                  "result": {
+                                    "title": "Result",
+                                    "type": "string",
+                                    "minLength": 1
                                   },
                                   "summary": {
                                     "type": "string",
@@ -18717,65 +18408,229 @@
                         }
                       ]
                     },
-                    "hasBeenFlooded": {
-                      "title": "Has any part of the property (whether buildings or surrounding garden or land) ever been flooded?",
-                      "type": "string",
-                      "enum": [
-                        "Yes",
-                        "No"
-                      ]
-                    }
-                  },
-                  "oneOf": [
-                    {
+                    "historicalFlooding": {
+                      "title": "Historical flooding",
+                      "type": "object",
                       "properties": {
                         "hasBeenFlooded": {
+                          "title": "Has any part of the property (whether buildings or surrounding garden or land) ever been flooded?",
+                          "type": "string",
                           "enum": [
+                            "Yes",
                             "No"
                           ]
                         }
-                      }
-                    },
-                    {
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "hasBeenFlooded": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
+                          }
+                        },
+                        {
+                          "properties": {
+                            "hasBeenFlooded": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "typeOfFlooding": {
+                              "title": "What type of flooding occurred?",
+                              "type": "array",
+                              "items": {
+                                "type": "string",
+                                "enum": [
+                                  "Ground water",
+                                  "Sewer",
+                                  "Surface water",
+                                  "Coastal flooding",
+                                  "River flooding",
+                                  "Other"
+                                ]
+                              }
+                            },
+                            "details": {
+                              "title": "Please state when the flooding occurred and identify the parts that flooded",
+                              "type": "string",
+                              "minLength": 1
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
+                },
+                "radon": {
+                  "title": "Radon",
+                  "type": "object",
+                  "properties": {
+                    "radonRisk": {
+                      "type": "object",
+                      "title": "Radon risk",
                       "properties": {
-                        "hasBeenFlooded": {
+                        "riskIndicator": {
+                          "type": "string",
+                          "title": "Is the property impacted?",
                           "enum": [
-                            "Yes"
+                            "Yes",
+                            "No"
                           ]
                         },
-                        "typeOfFlooding": {
-                          "title": "What type of flooding occurred?",
+                        "actionAlertRating": {
+                          "type": "integer",
+                          "title": "Action alert rating (1 is Green, 5 is Red)",
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
+                        "summary": {
+                          "type": "string",
+                          "title": "Summary of risk",
+                          "minLength": 1
+                        },
+                        "recommendations": {
+                          "type": "string",
+                          "title": "Recommendations",
+                          "minLength": 1
+                        },
+                        "datasetAttribution": {
+                          "type": "string",
+                          "title": "Licensing, distribution and copyright information",
+                          "minLength": 1
+                        },
+                        "riskSubcategories": {
                           "type": "array",
+                          "title": "Risk sub-categories",
                           "items": {
-                            "type": "string",
-                            "enum": [
-                              "Ground water",
-                              "Sewer",
-                              "Surface water",
-                              "Coastal flooding",
-                              "River flooding",
-                              "Other"
-                            ]
+                            "type": "object",
+                            "properties": {
+                              "subCategory": {
+                                "type": "string",
+                                "title": "Risk sub-category name"
+                              },
+                              "riskIndicator": {
+                                "type": "string",
+                                "title": "Is action recommended?",
+                                "enum": [
+                                  "Yes",
+                                  "No"
+                                ]
+                              },
+                              "actionAlertRating": {
+                                "type": "integer",
+                                "title": "Action alert rating (1 is Green, 5 is Red)",
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
+                              "summary": {
+                                "type": "string",
+                                "title": "Summary of risk",
+                                "minLength": 1
+                              },
+                              "recommendations": {
+                                "type": "string",
+                                "title": "Recommendations",
+                                "minLength": 1
+                              },
+                              "datasetAttribution": {
+                                "type": "string",
+                                "title": "Licensing, distribution and copyright information",
+                                "minLength": 1
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "radonTest": {
+                      "title": "Has a Radon test been carried out on the property?",
+                      "type": "object",
+                      "properties": {
+                        "yesNo": {
+                          "type": "string",
+                          "title": "",
+                          "enum": [
+                            "Yes",
+                            "No"
+                          ]
+                        }
+                      },
+                      "oneOf": [
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "No"
+                              ]
+                            }
                           }
                         },
-                        "details": {
-                          "title": "Please state when the flooding occurred and identify the parts that flooded",
+                        {
+                          "properties": {
+                            "yesNo": {
+                              "enum": [
+                                "Yes"
+                              ]
+                            },
+                            "details": {
+                              "title": "Was the test result was below the recommended action level?",
+                              "type": "string",
+                              "enum": [
+                                "Yes",
+                                "No"
+                              ]
+                            },
+                            "attachments": {
+                              "title": "Please supply a copy of the report",
+                              "type": "string",
+                              "enum": [
+                                "Attached",
+                                "To follow"
+                              ]
+                            }
+                          }
+                        }
+                      ]
+                    },
+                    "remedialMeasuresOnConstruction": {
+                      "title": "Were any remedial measures undertaken on construction to reduce Radon gas levels on the property?",
+                      "type": "object",
+                      "properties": {
+                        "yesNo": {
                           "type": "string",
-                          "minLength": 1
+                          "title": "",
+                          "enum": [
+                            "Yes",
+                            "No",
+                            "Not known"
+                          ]
                         }
                       }
                     }
-                  ]
+                  }
                 },
-                "radon": {
-                  "title": "Radon",
+                "contaminatedLand": {
+                  "title": "Contaminated land",
                   "type": "object",
                   "properties": {
-                    "radonRisk": {
+                    "contaminatedLandRisk": {
                       "type": "object",
-                      "title": "Radon risk",
+                      "title": "Contaminated land risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": [
@@ -18784,16 +18639,109 @@
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
+                        "summary": {
+                          "type": "string",
+                          "title": "Summary of risk",
+                          "minLength": 1
+                        },
+                        "recommendations": {
+                          "type": "string",
+                          "title": "Recommendations",
+                          "minLength": 1
+                        },
+                        "datasetAttribution": {
+                          "type": "string",
+                          "title": "Licensing, distribution and copyright information",
+                          "minLength": 1
+                        },
+                        "riskSubcategories": {
+                          "type": "array",
+                          "title": "Risk sub-categories",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "subCategory": {
+                                "type": "string",
+                                "title": "Risk sub-category name"
+                              },
+                              "riskIndicator": {
+                                "type": "string",
+                                "title": "Is action recommended?",
+                                "enum": [
+                                  "Yes",
+                                  "No"
+                                ]
+                              },
+                              "actionAlertRating": {
+                                "type": "integer",
+                                "title": "Action alert rating (1 is Green, 5 is Red)",
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
+                              },
+                              "summary": {
+                                "type": "string",
+                                "title": "Summary of risk",
+                                "minLength": 1
+                              },
+                              "recommendations": {
+                                "type": "string",
+                                "title": "Recommendations",
+                                "minLength": 1
+                              },
+                              "datasetAttribution": {
+                                "type": "string",
+                                "title": "Licensing, distribution and copyright information",
+                                "minLength": 1
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "groundStability": {
+                  "title": "Ground stability",
+                  "type": "object",
+                  "properties": {
+                    "groundStabilityRisk": {
+                      "type": "object",
+                      "title": "Ground stability risk",
+                      "properties": {
+                        "riskIndicator": {
+                          "type": "string",
+                          "title": "Is the property impacted?",
                           "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
+                            "Yes",
+                            "No"
                           ]
                         },
+                        "actionAlertRating": {
+                          "type": "integer",
+                          "title": "Action alert rating (1 is Green, 5 is Red)",
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
+                        },
                         "summary": {
                           "type": "string",
                           "title": "Summary of risk",
@@ -18819,7 +18767,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -18828,174 +18776,16 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
                               },
-                              "summary": {
+                              "result": {
+                                "title": "Result",
                                 "type": "string",
-                                "title": "Summary of risk",
                                 "minLength": 1
                               },
-                              "recommendations": {
-                                "type": "string",
-                                "title": "Recommendations",
-                                "minLength": 1
-                              },
-                              "datasetAttribution": {
-                                "type": "string",
-                                "title": "Licensing, distribution and copyright information",
-                                "minLength": 1
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "radonTest": {
-                      "title": "Has a Radon test been carried out on the property?",
-                      "type": "object",
-                      "properties": {
-                        "yesNo": {
-                          "type": "string",
-                          "title": "",
-                          "enum": [
-                            "Yes",
-                            "No"
-                          ]
-                        }
-                      },
-                      "oneOf": [
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "No"
-                              ]
-                            }
-                          }
-                        },
-                        {
-                          "properties": {
-                            "yesNo": {
-                              "enum": [
-                                "Yes"
-                              ]
-                            },
-                            "details": {
-                              "title": "Was the test result was below the recommended action level?",
-                              "type": "string",
-                              "enum": [
-                                "Yes",
-                                "No"
-                              ]
-                            },
-                            "attachments": {
-                              "title": "Please supply a copy of the report",
-                              "type": "string",
-                              "enum": [
-                                "Attached",
-                                "To follow"
-                              ]
-                            }
-                          }
-                        }
-                      ]
-                    },
-                    "remedialMeasuresOnConstruction": {
-                      "title": "Were any remedial measures undertaken on construction to reduce Radon gas levels on the property?",
-                      "type": "object",
-                      "properties": {
-                        "yesNo": {
-                          "type": "string",
-                          "title": "",
-                          "enum": [
-                            "Yes",
-                            "No",
-                            "Not known"
-                          ]
-                        }
-                      }
-                    }
-                  }
-                },
-                "contaminatedLand": {
-                  "title": "Contaminated land",
-                  "type": "object",
-                  "properties": {
-                    "contaminatedLandRisk": {
-                      "type": "object",
-                      "title": "Contaminated land risk",
-                      "properties": {
-                        "impactIndicator": {
-                          "type": "string",
-                          "title": "Is the property impacted?",
-                          "enum": [
-                            "Yes",
-                            "No"
-                          ]
-                        },
-                        "actionAlertRating": {
-                          "type": "string",
-                          "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
-                        },
-                        "summary": {
-                          "type": "string",
-                          "title": "Summary of risk",
-                          "minLength": 1
-                        },
-                        "recommendations": {
-                          "type": "string",
-                          "title": "Recommendations",
-                          "minLength": 1
-                        },
-                        "datasetAttribution": {
-                          "type": "string",
-                          "title": "Licensing, distribution and copyright information",
-                          "minLength": 1
-                        },
-                        "riskSubcategories": {
-                          "type": "array",
-                          "title": "Risk sub-categories",
-                          "items": {
-                            "type": "object",
-                            "properties": {
-                              "subCategory": {
-                                "type": "string",
-                                "title": "Risk sub-category name"
-                              },
-                              "impactIndicator": {
-                                "type": "string",
-                                "title": "Is action recommended?",
-                                "enum": [
-                                  "Yes",
-                                  "No"
-                                ]
-                              },
-                              "actionAlertRating": {
-                                "type": "string",
-                                "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
-                              },
                               "summary": {
                                 "type": "string",
                                 "title": "Summary of risk",
@@ -19018,15 +18808,15 @@
                     }
                   }
                 },
-                "groundStability": {
-                  "title": "Ground stability",
+                "infrastructure": {
+                  "title": "Infrastructure risk",
                   "type": "object",
                   "properties": {
-                    "groundStabilityRisk": {
+                    "infrastructureRisk": {
                       "type": "object",
-                      "title": "Ground stability risk",
+                      "title": "Infrastructure risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": [
@@ -19035,15 +18825,15 @@
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19070,7 +18860,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19079,15 +18869,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19119,7 +18909,7 @@
                       "type": "object",
                       "title": "Energy risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": [
@@ -19128,15 +18918,15 @@
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19163,7 +18953,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19172,15 +18962,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19212,7 +19002,7 @@
                       "type": "object",
                       "title": "Transportation risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": [
@@ -19221,15 +19011,15 @@
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19256,7 +19046,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19265,15 +19055,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19305,7 +19095,7 @@
                       "type": "object",
                       "title": "Planning risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": [
@@ -19314,15 +19104,15 @@
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19349,7 +19139,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19358,15 +19148,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19398,7 +19188,7 @@
                       "type": "object",
                       "title": "Climate risk",
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "type": "string",
                           "title": "Is the property impacted?",
                           "enum": [
@@ -19407,15 +19197,15 @@
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19442,7 +19232,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19451,15 +19241,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19487,7 +19277,7 @@
                   "title": "Coal mining",
                   "type": "object",
                   "properties": {
-                    "impactIndicator": {
+                    "riskIndicator": {
                       "type": "string",
                       "title": "Is the property impacted?",
                       "enum": [
@@ -19499,7 +19289,7 @@
                   "oneOf": [
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": [
                             "No"
                           ]
@@ -19508,21 +19298,21 @@
                     },
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": [
                             "Yes"
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19549,7 +19339,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19558,15 +19348,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19594,7 +19384,7 @@
                   "title": "Non-coal mining",
                   "type": "object",
                   "properties": {
-                    "impactIndicator": {
+                    "riskIndicator": {
                       "type": "string",
                       "title": "Is the property impacted?",
                       "enum": [
@@ -19606,7 +19396,7 @@
                   "oneOf": [
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": [
                             "No"
                           ]
@@ -19615,21 +19405,21 @@
                     },
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": [
                             "Yes"
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19657,7 +19447,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19666,15 +19456,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19702,7 +19492,7 @@
                   "title": "Coastal erosion",
                   "type": "object",
                   "properties": {
-                    "impactIndicator": {
+                    "riskIndicator": {
                       "type": "string",
                       "title": "Is the property impacted?",
                       "enum": [
@@ -19714,7 +19504,7 @@
                   "oneOf": [
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": [
                             "No"
                           ]
@@ -19723,21 +19513,21 @@
                     },
                     {
                       "properties": {
-                        "impactIndicator": {
+                        "riskIndicator": {
                           "enum": [
                             "Yes"
                           ]
                         },
                         "actionAlertRating": {
-                          "type": "string",
+                          "type": "integer",
                           "title": "Action alert rating (1 is Green, 5 is Red)",
-                          "enum": [
-                            "1",
-                            "2",
-                            "3",
-                            "4",
-                            "5"
-                          ]
+                          "minimum": 1,
+                          "maximum": 5
+                        },
+                        "result": {
+                          "title": "Result",
+                          "type": "string",
+                          "minLength": 1
                         },
                         "summary": {
                           "type": "string",
@@ -19765,7 +19555,7 @@
                                 "type": "string",
                                 "title": "Risk sub-category name"
                               },
-                              "impactIndicator": {
+                              "riskIndicator": {
                                 "type": "string",
                                 "title": "Is action recommended?",
                                 "enum": [
@@ -19774,15 +19564,15 @@
                                 ]
                               },
                               "actionAlertRating": {
-                                "type": "string",
+                                "type": "integer",
                                 "title": "Action alert rating (1 is Green, 5 is Red)",
-                                "enum": [
-                                  "1",
-                                  "2",
-                                  "3",
-                                  "4",
-                                  "5"
-                                ]
+                                "minimum": 1,
+                                "maximum": 5
+                              },
+                              "result": {
+                                "title": "Result",
+                                "type": "string",
+                                "minLength": 1
                               },
                               "summary": {
                                 "type": "string",
@@ -19810,7 +19600,7 @@
                   "title": "To your knowledge, have there been any other environmental issues that affect the property or garden (for example, these could include air pollution, mining, sink holes, quarrying or fracking etc)?",
                   "type": "object",
                   "properties": {
-                    "yesNo": {
+                    "riskIndicator": {
                       "type": "string",
                       "title": "",
                       "enum": [
@@ -19822,7 +19612,7 @@
                   "oneOf": [
                     {
                       "properties": {
-                        "yesNo": {
+                        "riskIndicator": {
                           "enum": [
                             "No",
                             "Not known"
@@ -19832,12 +19622,12 @@
                     },
                     {
                       "properties": {
-                        "yesNo": {
+                        "riskIndicator": {
                           "enum": [
                             "Yes"
                           ]
                         },
-                        "details": {
+                        "summary": {
                           "title": "Please provide details. For example the level of air pollution, location of fracking etc, and whether any action has been taken to prevent harm.",
                           "type": "string",
                           "minLength": 1
@@ -21061,11 +20851,11 @@
                     }
                   ]
                 },
-                "electricityMeterLocation": {
+                "electricityMeter": {
                   "title": "Location of electricity meter (if any)",
                   "type": "object",
                   "properties": {
-                    "description": {
+                    "location": {
                       "title": "Describe the location of the meter",
                       "type": "string",
                       "minLength": 1
@@ -21077,14 +20867,19 @@
                         "Attached",
                         "To follow"
                       ]
+                    },
+                    "mpan": {
+                      "title": "Meter Point Administration Number (MPAN)",
+                      "description": "Your MPAN is on your electricity or dual fuel bill, usually in a box marked ‘Supply Number’. It’s 21 digits long and begins with ‘S’. You’ll only need the last 12 or 13 digits.",
+                      "type": "integer"
                     }
                   }
                 },
-                "gasMeterLocation": {
+                "gasMeter": {
                   "title": "Location of gas meter (if any)",
                   "type": "object",
                   "properties": {
-                    "description": {
+                    "location": {
                       "title": "Describe the location of the meter",
                       "type": "string",
                       "minLength": 1
@@ -21096,14 +20891,19 @@
                         "Attached",
                         "To follow"
                       ]
+                    },
+                    "mprn": {
+                      "title": "Meter Point Reference Number (MPRN)",
+                      "description": "You can find your property’s MPRN on your gas or dual fuel bill. It’s usually marked ‘Meter Point Reference Number’ and is between six and 10 digits long.",
+                      "type": "integer"
                     }
                   }
                 },
-                "stopcockLocation": {
+                "stopcock": {
                   "title": "Location of stopcock (if any)",
                   "type": "object",
                   "properties": {
-                    "description": {
+                    "location": {
                       "title": "Describe the location of the stopcock",
                       "type": "string",
                       "minLength": 1
@@ -21118,11 +20918,11 @@
                     }
                   }
                 },
-                "waterMeterLocation": {
+                "waterMeter": {
                   "title": "Location of water meter (if any)",
                   "type": "object",
                   "properties": {
-                    "description": {
+                    "location": {
                       "title": "Describe the location of the meter",
                       "type": "string",
                       "minLength": 1
@@ -34482,126 +34282,7 @@
               "propertyType": {
                 "title": "Type of Property",
                 "description": "The type or category of the property.",
-                "type": "string",
-                "enum": [
-                  "Not Specified",
-                  "Terraced House",
-                  "End of terrace house",
-                  "Semi-detached house",
-                  "Detached house",
-                  "Mews house",
-                  "Cluster house",
-                  "Ground floor flat",
-                  "Flat",
-                  "Studio flat",
-                  "Ground floor maisonette",
-                  "Maisonette",
-                  "Bungalow",
-                  "Terraced bungalow",
-                  "Semi-detached bungalow",
-                  "Detached bungalow",
-                  "Mobile home",
-                  "Land (Residential)",
-                  "Link detached house",
-                  "Town house",
-                  "Cottage",
-                  "Chalet",
-                  "Character Property",
-                  "House (unspecified)",
-                  "Villa",
-                  "Apartment",
-                  "Penthouse",
-                  "Finca",
-                  "Barn Conversion",
-                  "Serviced apartment",
-                  "Parking",
-                  "Sheltered Housing",
-                  "Reteirment property",
-                  "House share",
-                  "Flat share",
-                  "Park home",
-                  "Garages",
-                  "Farm House",
-                  "Equestrian facility",
-                  "Duplex",
-                  "Triplex",
-                  "Longere",
-                  "Gite",
-                  "Barn",
-                  "Trulli",
-                  "Mill",
-                  "Ruins",
-                  "Restaurant",
-                  "Cafe",
-                  "Castle",
-                  "Village House",
-                  "Cave House",
-                  "Cortijo",
-                  "Farm Land",
-                  "Plot",
-                  "Country House",
-                  "Stone House",
-                  "Caravan",
-                  "Lodge",
-                  "Log Cabin",
-                  "Manor House",
-                  "Stately Home",
-                  "Off-Plan",
-                  "Semi-detached Villa",
-                  "Detached Villa",
-                  "Bar/Nightclub",
-                  "Shop",
-                  "Riad",
-                  "House Boat",
-                  "Hotel Room",
-                  "Block of Apartments",
-                  "Private Halls",
-                  "Office",
-                  "Business Park",
-                  "Serviced Office",
-                  "Retail Property (High Street)",
-                  "Retail Property (Out of Town)",
-                  "Convenience Store",
-                  "Hairdresser/Barber Shop",
-                  "Hotel",
-                  "Petrol Station",
-                  "Post Office",
-                  "Pub",
-                  "Workshop & Retail Space",
-                  "Distribution Warehouse",
-                  "Factory",
-                  "Heavy Industrial",
-                  "Industrial Park",
-                  "Light Industrial",
-                  "Storage",
-                  "Showroom",
-                  "Warehouse",
-                  "Land (Commercial)",
-                  "Commercial Development",
-                  "Industrial Development",
-                  "Residential Development",
-                  "Commercial Property",
-                  "Data Centre",
-                  "Farm",
-                  "Healthcare Facility",
-                  "Marine Property",
-                  "Mixed Use",
-                  "Research & Development Facility",
-                  "Science Park",
-                  "Guest House",
-                  "Hospitality",
-                  "Leisure Facility",
-                  "Takeaway",
-                  "Childcare Facility",
-                  "Smallholding",
-                  "Place of Worship",
-                  "Trade Counter",
-                  "Coach House",
-                  "House of Multiple Occupation",
-                  "Sports facilities",
-                  "Spa",
-                  "Campsite & Holiday Village"
-                ]
+                "type": "string"
               },
               "marketingTenure": {
                 "title": "Marketing Tenure",