epb_view_models 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd8197c49c85bbd4021c3ed7de879a39e384487045f458d5fabe1e2cbb277299
-  data.tar.gz: d5d06e72be91e7f565e6eeed197c4ba9eb8d31b37ad16dc766b6d00d31d8f977
+  metadata.gz: 8fc4f00f9b029744ebfd2a4e4de51636873e23fa4121ecbf9cc3b0244284b7d3
+  data.tar.gz: '002389e62c4c7c2bd3226852073621aa23a350b37737ddd1212ec78fb4a182b4'
 SHA512:
-  metadata.gz: e074c824fdc8e4b9ac2eb55a91269af924a09f6ef6088336324d272d6c7ae9dbef45a1e54134fd9ffe6638c05336d5349f2dfb0ba56c4831709c319c18ba8242
-  data.tar.gz: 8e63ed4516a7bd12ea77b1ff37a183836486852d38b6580aba671e0e773c6b5fc6f1b31a0dd5b7a15d796fdd77e4959751e1629086970422bf8948d76ab3bd8d
+  metadata.gz: 87bb3bc7e7fda3dcfb8fce735bcc37f7bae683def568392d3fa4874cf9da4c357eebc9276db8b3b08b125a7f3e7f7701a22d0b108174a2c7befd4701ea9cce01
+  data.tar.gz: ed5acc05eaaf16e4c64baada3083fb29884f68b7799fda3c0f4893ad8fb7f9c39ab3141313d8d8765a1791d94d0ee5504e5326c0e6b82858aaea146d6fe44f54

data/api/schemas/data/orchestrate.json

@@ -219,6 +219,10 @@
     "schema_path":
     "api/schemas/xml/RdSAP-Schema-S-14.0/RdSAP/Messages/ConditionReportCreateRequest_1.xsd"
   },
+  "RdSAP-Schema-S-12.0": {
+    "schema_path":
+    "api/schemas/xml/RdSAP-Schema-S-12.0/RdSAP/Messages/ConditionReportCreateRequest_1.xsd"
+  },
   "CEPC-8.0.0": {
     "schema_path": "api/schemas/xml/CEPC-8.0.0/Reports/CEPC-Reports.xsd"
   },

data/api/schemas/xml/RdSAP-Schema-S-12.0/RdSAP/CommonFiles/CommonStructures.xsd

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:CS="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/CommonStructures" xmlns:pfdt="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" targetNamespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/CommonStructures" elementFormDefault="qualified" attributeFormDefault="unqualified" version="LIG-12.0">
+	<!--
+	© Department of Communities and Local Government. © Crown copyright, 2007. The Home Condition Report logo and associated wording is a registered trade mark - any unlicensed use is not permitted. Copyright in the typographical arrangement of this document rests with the Crown. This publication, excluding logos, may be reproduced free of charge in any format or medium for research, private study, for internal circulation within an organisation or by registered scheme users. This is subject to it being reproduced accurately and not used in a misleading context. 
+
+-->
+	<!-- ***************************************************************************
+	Simple Type declarations for Identification Block property values
+	 *************************************************************************** -->
+	<xs:import namespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" schemaLocation="../UDT/BaseDataTypes.xsd"/>
+	<!-- ***************************************************************************
+	Simple Type declarations for Identification Block property values
+	 *************************************************************************** -->
+	<xs:simpleType name="ServiceNameType">
+		<xs:annotation>
+			<xs:documentation source="Service Name is a string label that uniquely identifies each service within the domain."/>
+		</xs:annotation>
+		<xs:restriction base="xs:string"/>
+		<!-- Should include validation of allowed Service Name constraints such as allowed charcaters etc. -->
+	</xs:simpleType>
+	<xs:simpleType name="OperationType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Create"/>
+			<xs:enumeration value="Retrieve"/>
+			<xs:enumeration value="Update"/>
+			<xs:enumeration value="Delete"/>
+			<xs:enumeration value="Retire"/>
+			<xs:enumeration value="Search"/>
+			<xs:enumeration value="Execute"/>
+			<xs:enumeration value="Describe"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="IdentifierValue">
+		<xs:annotation>
+			<xs:documentation source="Public Identifier datatype is the public identifier by which an instance of a Business Entity can be identified. It's called Public Form Identiier rather then Content Form Identifier for historic reasons as a result of confusion over definitions of terms."/>
+		</xs:annotation>
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="IdentifierTypeDomain" type="xs:string" use="optional">
+					<xs:annotation>
+						<xs:documentation source="Public Form Identifier datatype is the public identifier by which an instance of a Content Form can be identified. It's called Public Form Identiier rather then Content Form Identifier for historic reasons as a result of confusion over definitions of terms."/>
+					</xs:annotation>
+				</xs:attribute>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:simpleType name="ReportRetrievalType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="List"/>
+			<xs:enumeration value="Data"/>
+			<xs:enumeration value="PDF"/>
+		</xs:restriction>
+	</xs:simpleType>
+	<!-- ***************************************************************************
+	 Standard Identifying Block declarations
+
+	The Identification block contains standard data needed to identify an individual instance of a
+	particular service such as the service name, service provider, execution date.
+
+	Because there can be significant delays between the invocation of a service and the equivalent
+	response it is essential that each individual service request can be recognised. An individual
+	requestor may concurrently initiate many requests so the Identification blocks provide a
+	standard means of pairing the response to the particular request.
+
+	These data-items can be considered standard across all messages of a particular type but may be
+	extended by an individual service to include service specific parameters.
+
+	 *************************************************************************** -->
+	<!-- Standard Identification Message _________________________________________________ -->
+	<!--
+	This standard identification block then needs to be extended with an Identifier element
+	defining the allowed key attributes particular to the Business Entity retrieve via the service.
+	This is done on a message by message basis, for example:
+
+				<xs:element name="Identification">
+					<xs:complexType>
+						 <xs:complexContent>
+							<xs:extension base="CS:DefaultIDBlock">
+								<xs:sequence>
+									<xs:element name="Identifier" type="[IdentifierKeyFieldsType]"/>
+								</xs:sequence>
+							</xs:extension>
+						</xs:complexContent>
+					</xs:complexType>
+				</xs:element>
+
+-->
+	<xs:complexType name="DefaultIdBlock">
+		<xs:annotation>
+			<xs:documentation source="The standard Identifying Block for all messages."/>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="ServiceName" type="CS:ServiceNameType"/>
+			<xs:element name="Operation">
+				<xs:simpleType>
+					<xs:restriction base="CS:OperationType"/>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="TransactionDetails">
+				<xs:complexType>
+					<xs:sequence>
+						<xs:element name="OriginatingID" type="xs:string"/>
+						<xs:element name="RecipientID" type="xs:string"/>
+						<xs:element name="Timestamp" type="xs:dateTime"/>
+						<xs:element name="TransactionID" type="xs:string" minOccurs="0"/>
+					</xs:sequence>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="TermsAndConditions" minOccurs="0">
+				<xs:simpleType>
+					<xs:restriction base="pfdt:Flag"/>
+				</xs:simpleType>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<!-- ***************************************************************************
+	 Standard Configuration declarations
+
+	The Configuration block contains standard data required by the service to carry out its designated
+	task such as details of the parties / organisations involved in the transaction or operating
+	directions.
+
+	These are the configuration parameters that can be considered standard across all messages of a
+	particular type but may be extended by an individual service to include service specific
+	parameters.
+
+	Not all service types may need a Configuration block.
+	*************************************************************************** -->
+	<xs:complexType name="UpdateRequestConfigBlock">
+		<xs:sequence>
+			<xs:element name="StopOnFirstError" type="xs:string" minOccurs="0"/>
+			<xs:element name="ReasonForChange" type="xs:string" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="CreateRequestConfigBlock">
+		<xs:sequence>
+			<xs:element name="StopOnFirstError" type="xs:string" minOccurs="0"/>
+			<xs:element name="ReasonForChange" type="xs:string" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="RetrieveRequestConfigBlock">
+		<xs:sequence>
+			<xs:element name="StartDate" type="xs:date" minOccurs="0"/>
+			<xs:element name="Language" type="pfdt:LanguageCode" minOccurs="0"/>
+			<xs:element name="ResponseFormat" type="CS:ReportRetrievalType" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="SearchRequestConfigBlock">
+		<xs:sequence>
+			<xs:element name="RecordsToRetrieve" type="xs:long" minOccurs="0"/>
+			<xs:element name="StartRecord" type="xs:long" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="SearchResponseConfigBlock">
+		<xs:sequence>
+			<xs:element name="MoreRecords" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="MoreThanMaxRecords" type="xs:boolean" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+</xs:schema>

data/api/schemas/xml/RdSAP-Schema-S-12.0/RdSAP/CommonFiles/Exceptions.xsd

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/Exceptions" xmlns:ERR="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/Exceptions" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:pfdt="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" targetNamespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/Exceptions" elementFormDefault="qualified" version="LIG-12.0">
+	<!--
+	© Department of Communities and Local Government. © Crown copyright, 2007. The Home Condition Report logo and associated wording is a registered trade mark - any unlicensed use is not permitted. Copyright in the typographical arrangement of this document rests with the Crown. This publication, excluding logos, may be reproduced free of charge in any format or medium for research, private study, for internal circulation within an organisation or by registered scheme users. This is subject to it being reproduced accurately and not used in a misleading context. 
+
+-->
+	<xs:import namespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" schemaLocation="../UDT/BaseDataTypes.xsd"/>
+	<xs:element name="DataItem" type="DataItem"/>
+	<xs:complexType name="DataItem">
+		<xs:annotation>
+			<xs:documentation>The Data-Item from the input XML message that caused the data exception to be raised. 
+
+Each Data Item consists of the name of the XML Element(s) that caused the exception to be raised, the value assigned to the element and an optional reference to the individual element of there is more than one of them in the XML Message.
+
+</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="ItemName" type="xs:string">
+				<xs:annotation>
+					<xs:documentation>The name of the data-item that was in error. This is that actual name of the element as it is in the message, for example:
+
+	&lt;MyElementName&gt;[Value]&lt;/MyElementName&gt;
+
+would result in:
+
+	&lt;ItemName&gt;MyElementname&lt;/DataItem&gt;
+
+</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Path" type="xs:string" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The full X-Path to the XML Element containing the error. 
+
+This is required because there may be multiple data-items with the same name sometimes in separate functional components and sometimes the same functional component may occur multiple times. In both cases the Data-Item Name may not uniquely identify the actual error.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+			<xs:element name="Value" type="xs:anyType" minOccurs="0">
+				<xs:annotation>
+					<xs:documentation>The value that was in error. 
+
+This is an optional field because it may be the case where a mandatory data-item isn't present.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="ExceptionList" type="ExceptionList"/>
+	<xs:complexType name="ExceptionList">
+		<xs:sequence>
+			<xs:element name="Exception" type="Exception" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="Exception" type="Exception"/>
+	<xs:complexType name="Exception">
+		<xs:sequence>
+			<xs:element name="ErrorCode" type="pfdt:NumericString"/>
+			<xs:element name="ErrorMessage" type="pfdt:Sentence"/>
+			<xs:element name="DataItemList" type="DataItemList" minOccurs="0"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:element name="DataItemList" type="DataItemList"/>
+	<xs:complexType name="DataItemList">
+		<xs:annotation>
+			<xs:documentation>The set of Data-Items that were instrumental in raising the exception.
+
+This is an aggregation point for all of the Data-Items because there may be more than one Data-Item for each exception. For example if the check is that A = B and the check fails then the values of both A and B need to be returned as the context of the exception.</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element name="DataItem" type="DataItem" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+</xs:schema>

data/api/schemas/xml/{RdSAP-Schema-S-14.0/RdSAP/Messages/PropertyUPRNValidationRequest_1.xsd → RdSAP-Schema-S-12.0/RdSAP/Messages/ConditionReportCreateRequest_1.xsd}

@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:CS="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/CommonStructures" xmlns:ERR="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/Exceptions" xmlns:pfdt="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" xmlns:HIP="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP" elementFormDefault="qualified" attributeFormDefault="unqualified" version="LIG-14.0">
+<xs:schema 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:CS="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/CommonStructures"
+  xmlns:ERR="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/Exceptions"
+  xmlns:pfdt="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes"
+  xmlns:SAP05="http://www.est.org.uk/epc/lodgement/estV20/DCLG-SAP05"
+  xmlns:HIP="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP"
+  targetNamespace="http://www.est.org.uk/epc/lodgement"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified"
+  version="LIG-12.0"
+>
 	<!--
 	© Department of Communities and Local Government. © Crown copyright, 2007. The Home Condition Report logo and associated wording is a registered trade mark - any unlicensed use is not permitted. Copyright in the typographical arrangement of this document rests with the Crown. This publication, excluding logos, may be reproduced free of charge in any format or medium for research, private study, for internal circulation within an organisation or by registered scheme users. This is subject to it being reproduced accurately and not used in a misleading context. 
 
@@ -13,28 +25,25 @@
 	<xs:import namespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" schemaLocation="../UDT/BaseDataTypes.xsd"/>
 	<!-- Include templates for all Business Entities used by the message -->
 	<xs:import namespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP" schemaLocation="../Templates/HIP-Reports.xsd"/>
+	<!-- Add the New build SAP-EPC data model -->
+ <!--<xs:import namespace="http://www.est.org.uk/epc/lodgement/DCLG-SAP05" schemaLocation="../SAP-EPC/Templates/SAP05-Report.xsd"/>-->
 	<!--***************************************************************************
 	Message Definition
 	*************************************************************************** -->
-	<xs:element name="PropertyUPRNValidationRequest_1">
+	<xs:element name="ConditionReportCreateRequest_1">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Identification">
-					<xs:complexType>
-						<xs:complexContent>
-							<xs:extension base="CS:DefaultIdBlock">
-								<xs:sequence>
-									<xs:element name="UPRN" type="HIP:UPRNType"/>
-								</xs:sequence>
-							</xs:extension>
-						</xs:complexContent>
-					</xs:complexType>
-				</xs:element>
+				<xs:element name="Identification" type="CS:DefaultIdBlock"/>
+				<xs:element name="Configuration" type="CS:CreateRequestConfigBlock"/>
 				<xs:element name="Content">
 					<xs:complexType>
 						<xs:sequence>
-							<xs:element name="Address" type="HIP:AddressType"/>
-							<xs:element name="Language" type="pfdt:LanguageCode" default="1"/>
+							<xs:choice>
+                <!--<xs:element name="SAP-EPC-Data" type="SAP05:Energy-Performance-Certificate"/>-->
+								<xs:element name="EPC-Data" type="HIP:Energy-Performance-Certificate"/>
+								<xs:element name="HCR-Data" type="HIP:Home-Condition-Report"/>
+							</xs:choice>
+							<xs:element name="PDF" type="xs:base64Binary"/>
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>

data/api/schemas/xml/{RdSAP-Schema-S-14.0/RdSAP/SAP-EPC → RdSAP-Schema-S-12.0/RdSAP}/Templates/EPC-Certificate.xsd

@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-SAP05" xmlns="http://www.est.org.uk/epc/lodgement/estV20/DCLG-SAP05" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:bdt="http://www.est.org.uk/epc/lodgement/estV20/DCLG-SAP05/BaseDataTypes" xmlns:SAP05="http://www.est.org.uk/epc/lodgement/estV20/DCLG-SAP05" elementFormDefault="qualified" version="LIG-14.0">
-	<xs:import namespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-SAP05/BaseDataTypes" schemaLocation="../UDT/BaseDataTypes.xsd"/>
+<xs:schema targetNamespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP" xmlns="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:pfdt="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" xmlns:HIP="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP" version="LIG-12.0">
+	<xs:annotation>
+		<xs:documentation>© Department of Communities and Local Government. © Crown copyright, 2007. The Home Condition Report logo and associated wording is a registered trade mark - any unlicensed use is not permitted. Copyright in the typographical arrangement of this document rests with the Crown. This publication, excluding logos, may be reproduced free of charge in any format or medium for research, private study, for internal circulation within an organisation or by registered scheme users. This is subject to it being reproduced accurately and not used in a misleading context.</xs:documentation>
+	</xs:annotation>
+	<xs:import namespace="http://www.est.org.uk/epc/lodgement/estV20/DCLG-HIP/BaseDataTypes" schemaLocation="../UDT/BaseDataTypes.xsd"/>
+	<xs:include schemaLocation="../UDT/SAP-Domains.xsd"/>
 	<xs:include schemaLocation="../UDT/EPC-Domains.xsd"/>
-	<xs:include schemaLocation="../UDT/SAP05-Domains.xsd"/>
-	<xs:element name="LZC-Energy-Sources" type="LZC-Energy-Sources"/>
-	<xs:complexType name="LZC-Energy-Sources">
-		<xs:annotation>
-			<xs:documentation>Details of low and zero carbon energy source(s) for the property, if any.</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="LZC-Energy-Source" type="SAP-LZCEnergySourceCode" minOccurs="1" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>Low and zero carbon energy source(s) for the property.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
 	<xs:simpleType name="EnergyRatingType">
 		<xs:restriction base="xs:integer">
 			<xs:minInclusive value="0"/>
@@ -26,15 +16,9 @@
 		<xs:annotation>
 			<xs:documentation>Energy Efficiency Assessment Report is an inspection report whose purpose is to assess the energy efficiency of the inspected property and provide energy ratings for the significant heat-loss features of the property. 
 
-The report also identifies a number of potential improvements that may be made to the property in order to increase the energy efficiency.
-</xs:documentation>
+The report also identifies a number of potential improvements that may be made to the property in order to increase the energy efficiency.</xs:documentation>
 		</xs:annotation>
 		<xs:all>
-			<xs:element name="Assessment-Date" type="xs:date" minOccurs="1" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Date of assessment.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
 			<xs:element name="Property-Summary" type="Property-Summary" minOccurs="1" maxOccurs="1"/>
 			<xs:element name="Energy-Use" type="Energy-Use" minOccurs="1" maxOccurs="1"/>
 			<xs:element name="Suggested-Improvements" type="Suggested-Improvements" minOccurs="0" maxOccurs="1"/>
@@ -44,46 +28,17 @@ The report also identifies a number of potential improvements that may be made t
 	<xs:element name="Property-Summary" type="Property-Summary"/>
 	<xs:complexType name="Property-Summary">
 		<xs:sequence>
-			<xs:element name="Walls" type="PropertySummaryType" minOccurs="1" maxOccurs="unbounded"/>
+			<xs:element name="Wall" type="PropertySummaryType" minOccurs="1" maxOccurs="unbounded"/>
 			<xs:element name="Roof" type="PropertySummaryType" minOccurs="1" maxOccurs="unbounded"/>
 			<xs:element name="Floor" type="PropertySummaryType" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element name="Windows" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="Window" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
 			<xs:element name="Main-Heating" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
 			<xs:element name="Main-Heating-Controls" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="Secondary-Heating" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
 			<xs:element name="Hot-Water" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
 			<xs:element name="Lighting" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
-			<xs:element name="Air-Tightness" type="PropertySummaryType" minOccurs="0" maxOccurs="1"/>
-			<xs:element name="Has-Fixed-Air-Conditioning" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false">
-				<xs:annotation>
-					<xs:documentation>Fixed air conditioning?</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Has-Hot-Water-Cylinder" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false">
-				<xs:annotation>
-					<xs:documentation>Hot water cylinder?</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Has-Heated-Separate-Conservatory" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false">
-				<xs:annotation>
-					<xs:documentation>Heated separate conservatory?</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Dwelling-Type" type="bdt:Sentence" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Is a string such as Detached house or Top-floor flat</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Total-Floor-Area" type="xs:positiveInteger" minOccurs="0" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>Is a number such as 125</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Is-Zero-Carbon-Home" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false">
-				<xs:annotation>
-					<xs:documentation>Is dwelling a Zero Carbon Home?</xs:documentation>
-				</xs:annotation>
-			</xs:element>
+			<xs:element name="Secondary-Heating" type="PropertySummaryType" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="Has-Hot-Water-Cylinder" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false"/>
+			<xs:element name="Has-Heated-Separate-Conservatory" type="xs:boolean" minOccurs="0" maxOccurs="1" default="false"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="Energy-Use" type="Energy-Use"/>
@@ -112,57 +67,57 @@ The report also identifies a number of potential improvements that may be made t
 					<xs:documentation>The estimated potential Environmental Impact Rating of the property</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Energy-Consumption-Current" type="bdt:Measurement" minOccurs="1" maxOccurs="1">
+			<xs:element name="Energy-Consumption-Current" type="pfdt:Measurement" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>Estimated total energy consumption for the Property in a 12 month period. Value is Kilowatt Hours per Square Metre (kWh/m2)</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Energy-Consumption-Potential" type="bdt:Measurement" minOccurs="1" maxOccurs="1">
+			<xs:element name="Energy-Consumption-Potential" type="pfdt:Measurement" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>Estimated total energy consumption for the Property in a 12 month period. Value is Kilowatt Hours per Square Metre (kWh/m2)</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CO2-Emissions-Current" type="bdt:Measurement" minOccurs="1" maxOccurs="1">
+			<xs:element name="CO2-Emissions-Current" type="pfdt:Measurement" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>CO2 emissions per year in tonnes/year.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CO2-Emissions-Current-Per-Floor-Area" type="bdt:Measurement" minOccurs="1" maxOccurs="1">
+			<xs:element name="CO2-Emissions-Current-Per-Floor-Area" type="pfdt:Measurement" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>CO2 emissions per square metre floor area per year in kg/m².</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="CO2-Emissions-Potential" type="bdt:Measurement" minOccurs="1" maxOccurs="1">
+			<xs:element name="CO2-Emissions-Potential" type="pfdt:Measurement" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>Estimated value in Tonnes per Year of the total CO2 emissions produced by the Property in 12 month period.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Lighting-Cost-Current" type="bdt:Money" minOccurs="1" maxOccurs="1">
+			<xs:element name="Lighting-Cost-Current" type="pfdt:Money" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>The current estimated cost of Lighting for the property</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Lighting-Cost-Potential" type="bdt:Money" minOccurs="1" maxOccurs="1">
+			<xs:element name="Lighting-Cost-Potential" type="pfdt:Money" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>The current estimated cost of Lighting for the property</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Heating-Cost-Current" type="bdt:Money" minOccurs="1" maxOccurs="1">
+			<xs:element name="Heating-Cost-Current" type="pfdt:Money" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>The current estimated cost of Heating for the property</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Heating-Cost-Potential" type="bdt:Money" minOccurs="1" maxOccurs="1">
+			<xs:element name="Heating-Cost-Potential" type="pfdt:Money" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>The current estimated cost of Heating for the property</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Hot-Water-Cost-Current" type="bdt:Money" minOccurs="1" maxOccurs="1">
+			<xs:element name="Hot-Water-Cost-Current" type="pfdt:Money" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>|The current estimated cost of Hot Water for the property</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Hot-Water-Cost-Potential" type="bdt:Money" minOccurs="1" maxOccurs="1">
+			<xs:element name="Hot-Water-Cost-Potential" type="pfdt:Money" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>|The current estimated cost of Hot Water for the property</xs:documentation>
 				</xs:annotation>
@@ -190,67 +145,45 @@ The Improved Energy Ratings that result from carrying out a Suggested Improvemen
 			</xs:element>
 			<xs:element name="Improvement-Category" type="RecommendationCategoryCode" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
-					<xs:documentation>The category of improvement. This identifies where on the report the recommendation is printed.</xs:documentation>
+					<xs:documentation>The categfory of improvement. This identifies where on the report the recommendation is printed.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Improvement-Type" type="SAP-ImprovementMeasureCode" minOccurs="1" maxOccurs="1">
+			<xs:element name="Improvement-Summary" type="pfdt:Sentence" minOccurs="0" maxOccurs="1">
 				<xs:annotation>
-					<xs:documentation>Suggested work to be carried out on the Property to improve its energy efficiency. This should be a enumerated list of acceptable improvements but it hasn't yet been defined.</xs:documentation>
+					<xs:documentation>A short description of the suggested improvement.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Typical-Saving" type="bdt:Money" minOccurs="1" maxOccurs="1">
+			<xs:element name="Improvement-Heading" type="pfdt:Sentence" minOccurs="0" maxOccurs="1">
 				<xs:annotation>
-					<xs:documentation>Typical savings (in British Pounds) per year if the suggested improvement is carried out.</xs:documentation>
-				</xs:annotation>
-			</xs:element>
-			<xs:element name="Energy-Performance-Rating" type="EnergyRatingType" minOccurs="1" maxOccurs="1">
-				<xs:annotation>
-					<xs:documentation>The estimated Energy performance rating of the Property after the Suggested Improvement has been carried out providing any preceding Suggested Improvement has also been carried out.</xs:documentation>
+					<xs:documentation>Text to precede the improvement description. If this field is not provided the 'Improvement-Summary' is used instead.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Environmental-Impact-Rating" type="EnergyRatingType" minOccurs="1" maxOccurs="1">
+			<xs:element name="Improvement-Description" type="pfdt:Sentence" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
-					<xs:documentation>The estimated Environmental Impact rating of the Property after the Suggested Improvement has been carried out providing any preceding Suggested Improvement has also been carried out.</xs:documentation>
+					<xs:documentation>Detailed description of the suggested improvement.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Improvement-Details">
-				<xs:complexType>
-					<xs:choice>
-						<xs:element name="Improvement-Texts" type="ImprovementTexts" minOccurs="1" maxOccurs="1">
-							<xs:annotation>
-								<xs:documentation>For backward compatability only</xs:documentation>
-							</xs:annotation>
-						</xs:element>
-						<xs:element name="Improvement-Number" type="RecommendationSummaryCode" minOccurs="1" maxOccurs="1"/>
-					</xs:choice>
-				</xs:complexType>
-			</xs:element>
-		</xs:all>
-	</xs:complexType>
-	<xs:element name="ImprovementTexts" type="ImprovementTexts"/>
-	<xs:complexType name="ImprovementTexts">
-		<xs:sequence>
-			<xs:element name="Improvement-Summary" type="bdt:Sentence" minOccurs="0" maxOccurs="1">
+			<xs:element name="Typical-Saving" type="pfdt:Money" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
-					<xs:documentation>A short description of the suggested improvement.</xs:documentation>
+					<xs:documentation>Typical savings (in British Pounds) per year if the suggested improvement is carried out.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Improvement-Heading" type="bdt:Sentence" minOccurs="0" maxOccurs="1">
+			<xs:element name="Energy-Performance-Rating" type="EnergyRatingType" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
-					<xs:documentation>Text to precede the improvement description. If this field is not provided the 'Improvement-Summary' is used instead.</xs:documentation>
+					<xs:documentation>The estimated Energy performance rating of the Property after the Suggested Improvement has been carried out providing any preceding Suggested Improvement has also been carried out.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="Improvement-Description" type="bdt:Sentence" minOccurs="1" maxOccurs="1">
+			<xs:element name="Environmental-Impact-Rating" type="EnergyRatingType" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
-					<xs:documentation>Detailed description of the suggested improvement.</xs:documentation>
+					<xs:documentation>The estimated Environmental Impact rating of the Property after the Suggested Improvement has been carried out providing any preceding Suggested Improvement has also been carried out.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-		</xs:sequence>
+		</xs:all>
 	</xs:complexType>
 	<xs:element name="PropertySummaryType" type="PropertySummaryType"/>
 	<xs:complexType name="PropertySummaryType">
 		<xs:all>
-			<xs:element name="Description" type="bdt:Sentence" minOccurs="0" maxOccurs="1">
+			<xs:element name="Description" type="pfdt:Sentence" minOccurs="1" maxOccurs="1">
 				<xs:annotation>
 					<xs:documentation>Overall description of the property feature</xs:documentation>
 				</xs:annotation>
@@ -267,4 +200,14 @@ The Improved Energy Ratings that result from carrying out a Suggested Improvemen
 			</xs:element>
 		</xs:all>
 	</xs:complexType>
+	<xs:element name="LZC-Energy-Sources" type="LZC-Energy-Sources"/>
+	<xs:complexType name="LZC-Energy-Sources">
+		<xs:sequence>
+			<xs:element name="LZC-Energy-Source" type="SAP-LZCEnergySourceCode" minOccurs="1" maxOccurs="unbounded">
+				<xs:annotation>
+					<xs:documentation>Low and zero carbon energy source(s) for the property.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
 </xs:schema>