Repository: open-contracting/ocdskit

Issue:
mapping-sheet: script omits original description when a reference is used for an object
Currently the flattened schema produced by the mapping-sheet script omits the original description (and other properties) for objects where a reference is used, this means users of the flattened schema may miss out on important context.

**Example 1:**

The `description` for `buyer` is:

> The buyer is the entity whose budget will be used to purchase the goods. This may be different from the procuring entity who may be specified in the tender data.

However in the flattened schema this is replaced by the `description` from the referenced `organizationReference` object:

path | title | description
-- | -- | --
buyer | Organization reference | The id and name of the party being referenced. Used to cross-reference to the parties section

So the user misses out on the distinction between buyer and procuring entity.

**Example 2:**

The `description` for `organizationReference/address` is:

> (Deprecated outside the parties section)

However in the flattened schema this is replaced by the `description` from the referenced `address` object:

path | title | description
-- | -- | --
buyer/address | Address | An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.

So the user can't see that the `address` object is deprecated in this case (the deprecation properties are not set because the `address` object itself has not been deprecated, just it's use in this location)

**Suggested approach:**

Where the reference is inside an array the mapping-sheet already produces two rows, one for the array and one for the objects in it, e.g.

path | title | description | type
-- | -- | -- | --
planning/documents | Documents | A list of documents related to the planning process. | array
planning/documents | Document | Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting. | object

We could extend that behavior to references which aren't in arrays, using a type of "reference" for the row displaying the properties of the parent:

path | title | description | type
-- | -- | -- | --
buyer | Buyer | The buyer is the entity whose budget will be used to purchase the goods. This may be different from the procuring entity who may be specified in the tender data. | reference
buyer | Organization reference | The id and name of the party being referenced. Used to cross-reference to the parties section | object


Discussion:

Patch:
diff --git a/.travis.yml b/.travis.yml
index 7706cb5..e2efa3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 language: python
 cache: pip
 python:
diff --git a/ocdskit/cli/commands/mapping_sheet.py b/ocdskit/cli/commands/mapping_sheet.py
index 7bb1311..d86108b 100644
--- a/ocdskit/cli/commands/mapping_sheet.py
+++ b/ocdskit/cli/commands/mapping_sheet.py
@@ -33,75 +33,87 @@ class Command(BaseCommand):
         def display_links(links):
             return ', '.join(links.values())
 
-        def display_properties(schema, path='', section='', deprecated=''):
-            # Create a copy of obj, because there may be references to it from
-            # elsewhere in the JSON schema, and we don't want to mutate it in
-            # all those places
-            obj = copy.deepcopy(schema['properties'])
-            required_fields = schema['required'] if 'required' in schema else []
-            rows = []
-            for field in obj:
-                row = {'path': path + field, 'deprecated': deprecated}
+        def make_row(path, field, schema, deprecated, required_fields, is_reference=False):
+            row = {'path': path+field, 'deprecated': deprecated}
 
-                section = row['path'].split('/')[0] if '/' in row['path'] else ''
+            section = row['path'].split('/')[0] if '/' in row['path'] else ''
 
-                row['section'] = section
+            row['section'] = section
 
-                # If there was a reference here, prefer the values from that
-                if hasattr(obj[field], '__reference__'):
-                    obj[field].update(obj[field].__reference__)
-
-                row['title'] = obj[field]['title'] if 'title' in obj[field] else field + '*'
-
-                if 'description' in obj[field]:
-                    links = find_md_links(obj[field]['description'])
-                    row['description'] = remove_links(obj[field]['description'], links)
-                    row['links'] = display_links(links)
-
-                # Type
-                if 'type' in obj[field]:
-                    # ToDo: Add checking of the required array also.
-                    # This checks whether this field is **implicity required**
-                    if 'null' in obj[field]['type']:
-                        obj[field]['type'].remove('null')
-                        required = False
-                    else:
-                        required = 'string' in obj[field]['type'] or 'integer' in obj[field]['type']
-
-                    if type(obj[field]['type']) in (tuple, list):
-                        row['type'] = ', '.join(obj[field]['type'])
-                    else:
-                        row['type'] = obj[field]['type']
+            row['title'] = schema['title'] if 'title' in schema else field + '*'
+
+            if 'description' in schema:
+                links = find_md_links(schema['description'])
+                row['description'] = remove_links(schema['description'], links)
+                row['links'] = display_links(links)
+
+            required = False
+
+            # Type
+            if 'type' in schema:
+                # This checks whether this field is **implicity required**
+                type_ = copy.copy(schema['type'])
+                if 'null' in type_:
+                    type_.remove('null')
                 else:
-                    row['type'] = 'unknown'
-
-                # Required field
-                if field in required_fields:
-                    required = True
-
-                maxn = 'n' if row['type'] == 'array' else '1'
-                minn = '1' if required else '0'
-                row['range'] = minn + '..' + maxn
-
-                # Format or restrictions
-                if 'format' in obj[field]:
-                    row['values'] = obj[field]['format']
-                elif 'enum' in obj[field]:
-                    if None in obj[field]['enum']:
-                        obj[field]['enum'].remove(None)
-                    row['values'] = 'Codelist: ' + ', '.join(obj[field]['enum'])
+                    required = 'string' in type_ or 'integer' in type_
+
+                if type(type_) in (tuple, list):
+                    row['type'] = ', '.join(type_)
                 else:
-                    row['values'] = ''
+                    row['type'] = type_
+            else:
+                row['type'] = 'unknown'
+
+            # This checks whether this field is **explicitly required**
+            if field in required_fields:
+                required = True
+
+            maxn = 'n' if row['type'] == 'array' else '1'
+            minn = '1' if required else '0'
+            row['range'] = minn + '..' + maxn
+
+            # Format or restrictions
+            if 'format' in schema:
+                row['values'] = schema['format']
+            elif 'enum' in schema:
+                values = copy.copy(schema['enum'])
+                if None in values:
+                    values.remove(None)
+                row['values'] = 'Codelist: ' + ', '.join(values)
+            else:
+                row['values'] = ''
+
+            # Check for deprecation
+            if 'deprecated' in schema:
+                row['deprecated'] = schema['deprecated'].get('deprecatedVersion', '')
+                row['deprecationNotes'] = schema['deprecated'].get('description', '')
+
+            return row
 
-                # Check for deprecation
-                if 'deprecated' in obj[field]:
-                    row['deprecated'] = obj[field]['deprecated'].get('deprecatedVersion', '')
-                    row['deprecationNotes'] = obj[field]['deprecated'].get('description', '')
+        def display_properties(schema, path='', section='', deprecated=''):
+            obj = schema['properties']
+            required_fields = schema['required'] if 'required' in schema else []
+            rows = []
+            for field in obj:
+                # If there was a reference, add an extra row for that
+                if hasattr(obj[field], '__reference__'):
+                    reference = copy.copy(obj[field].__reference__)
+                    if 'type' not in reference and 'type' in obj[field]:
+                        reference['type'] = obj[field]['type']
+                    reference_row = make_row(
+                        path, field, reference, deprecated, required_fields, is_reference=True)
+                    rows.append(reference_row)
+                else:
+                    reference_row = {}
 
+                row = make_row(path, field, obj[field], deprecated, required_fields)
                 rows.append(row)
 
+                children_deprecated = reference_row.get('deprecated') or reference_row.get('deprecated')
+
                 if 'properties' in obj[field]:
-                    rows = rows + display_properties(obj[field], path + field + '/', section, row['deprecated'])
+                    rows = rows + display_properties(obj[field], path + field + '/', section, children_deprecated)
 
                 if 'items' in obj[field]:
                     if 'properties' in obj[field]['items']:


Test patch:
diff --git a/tests/fixtures/mapping-sheet.csv b/tests/fixtures/mapping-sheet.csv
index 996ceff..8744873 100644
--- a/tests/fixtures/mapping-sheet.csv
+++ b/tests/fixtures/mapping-sheet.csv
@@ -8,23 +8,26 @@ section,path,title,description,type,range,values,links,deprecated,deprecationNot
 ,parties,Organization,A party (organization),object,,,,,
 parties,parties/name,Common name,"A common name for this organization or other participant in the contracting process. The identifier object provides an space for the formal legal name, and so this may either repeat that value, or could provide the common name by which this organization or entity is known. This field may also include details of the department or sub-unit involved in this contracting process.",string,0..1,,,,
 parties,parties/id,Entity ID,The ID used for cross-referencing to this party from other sections of the release. This field may be built with the following structure {identifier.scheme}-{identifier.id}(-{department-identifier}).,string,1..1,,,,
+parties,parties/identifier,Primary identifier,The primary identifier for this organization or participant. Identifiers that uniquely pick out a legal entity should be preferred. Consult the organization identifier guidance for the preferred scheme and identifier to use.,object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,,
 parties,parties/identifier,Identifier,,object,0..1,,,,
 parties,parties/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
 parties,parties/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
 parties,parties/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
 parties,parties/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
 parties,parties/additionalIdentifiers,Additional identifiers,"A list of additional / supplemental identifiers for the organization or participant, using the organization identifier guidance. This could be used to provide an internally used identifier for this organization in addition to the primary legal entity identifier.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,,
-parties,parties/additionalIdentifiers,Identifier,,object,,,,,
+,parties/additionalIdentifiers,Identifier,,object,,,,,
 parties,parties/additionalIdentifiers/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
 parties,parties/additionalIdentifiers/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
 parties,parties/additionalIdentifiers/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
 parties,parties/additionalIdentifiers/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+parties,parties/address,address*,,object,0..1,,,,
 parties,parties/address,Address,"An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.",object,0..1,,,,
 parties,parties/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,,
 parties,parties/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,,
 parties,parties/address/region,Region,"The region. For example, CA.",string,0..1,,,,
 parties,parties/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,,
 parties,parties/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,,
+parties,parties/contactPoint,contactPoint*,,object,0..1,,,,
 parties,parties/contactPoint,Contact point,"An person, contact point or department to contact in relation to this contracting process.",object,0..1,,,,
 parties,parties/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,,
 parties,parties/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,,
@@ -33,37 +36,44 @@ parties,parties/contactPoint/faxNumber,Fax number,The fax number of the contact
 parties,parties/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,,
 parties,parties/roles,Party roles,"The party's role(s) in the contracting process. Role(s) should be taken from the partyRole codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#party-role,,
 parties,parties/details,Details,Additional classification information about parties can be provided using partyDetail extensions that define particular properties and classification schemes. ,object,0..1,,,,
+,buyer,Buyer,The buyer is the entity whose budget will be used to purchase the goods. This may be different from the procuring entity who may be specified in the tender data.,object,0..1,,,,
 ,buyer,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,0..1,,,,
 buyer,buyer/name,Organization name,The name of the party being referenced. This must match the name of an entry in the parties section.,string,1..1,,,,
 buyer,buyer/id,Organization ID,The id of the party being referenced. This must match the id of an entry in the parties section.,"string, integer",1..1,,,,
+buyer,buyer/identifier,Primary identifier,The primary identifier for this organization. Identifiers that uniquely pick out a legal entity should be preferred. Consult the organization identifier guidance for the preferred scheme and identifier to use.,object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and detailed legal identifier information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 buyer,buyer/identifier,Identifier,,object,0..1,,,,
-buyer,buyer/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-buyer,buyer/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-buyer,buyer/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-buyer,buyer/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+buyer,buyer/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+buyer,buyer/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+buyer,buyer/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+buyer,buyer/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+buyer,buyer/address,Address,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and address information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 buyer,buyer/address,Address,"An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.",object,0..1,,,,
-buyer,buyer/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,,
-buyer,buyer/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,,
-buyer,buyer/address/region,Region,"The region. For example, CA.",string,0..1,,,,
-buyer,buyer/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,,
-buyer,buyer/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,,
+buyer,buyer/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,1.1,
+buyer,buyer/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,1.1,
+buyer,buyer/address/region,Region,"The region. For example, CA.",string,0..1,,,1.1,
+buyer,buyer/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,1.1,
+buyer,buyer/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,1.1,
 buyer,buyer/additionalIdentifiers,Additional identifiers,"(Deprecated outside the parties section) A list of additional / supplemental identifiers for the organization, using the organization identifier guidance. This could be used to provide an internally used identifier for this organization in addition to the primary legal entity identifier.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and additional identifiers for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
-buyer,buyer/additionalIdentifiers,Identifier,,object,,,,,
+,buyer/additionalIdentifiers,Identifier,,object,,,,,
 buyer,buyer/additionalIdentifiers/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
 buyer,buyer/additionalIdentifiers/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
 buyer,buyer/additionalIdentifiers/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
 buyer,buyer/additionalIdentifiers/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+buyer,buyer/contactPoint,Contact point,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and contact point information for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 buyer,buyer/contactPoint,Contact point,"An person, contact point or department to contact in relation to this contracting process.",object,0..1,,,,
-buyer,buyer/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,,
-buyer,buyer/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,,
-buyer,buyer/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-buyer,buyer/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-buyer,buyer/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,,
+buyer,buyer/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,1.1,
+buyer,buyer/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,1.1,
+buyer,buyer/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+buyer,buyer/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+buyer,buyer/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,1.1,
+,planning,Planning,"Information from the planning phase of the contracting process. This includes information related to the process of deciding what to contract, when and how.",object,0..1,,,,
 ,planning,Planning,"Information from the planning phase of the contracting process. Note that many other fields may be filled in a planning release, in the appropriate fields in other schema sections, these would likely be estimates at this stage e.g. totalValue in tender",object,0..1,,,,
 planning,planning/rationale,Rationale,The rationale for the procurement provided in free text. More detail can be provided in an attached document.,string,0..1,,,,
+planning,planning/budget,budget*,,object,0..1,,,,
 planning,planning/budget,Budget information,"This section contain information about the budget line, and associated projects, through which this contracting process is funded. It draws upon data model of the Fiscal Data Package, and should be used to cross-reference to more detailed information held using a Budget Data Package, or, where no linked Budget Data Package is available, to provide enough information to allow a user to manually or automatically cross-reference with another published source of budget and project information.",object,0..1,,http://fiscal.dataprotocols.org/,,
 planning,planning/budget/id,ID,An identifier for the budget line item which provides funds for this contracting process. This identifier should be possible to cross-reference against the provided data source.,"string, integer",0..1,,,,
 planning,planning/budget/description,Budget Source,"A short free text description of the budget source. May be used to provide the title of the budget line, or the programme used to fund this project.",string,0..1,,,,
+planning,planning/budget/amount,Amount,"The value reserved in the budget for this contracting process. A negative value indicates anticipated income to the budget as a result of this contracting process, rather than expenditure. Where the budget is drawn from multiple sources, the budget breakdown extension can be used.",object,0..1,,,,
 planning,planning/budget/amount,Value,,object,0..1,,,,
 planning,planning/budget/amount/amount,Amount,Amount as a number.,number,0..1,,,,
 planning,planning/budget/amount/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
@@ -72,7 +82,7 @@ planning,planning/budget/projectID,Project identifier,"An external identifier fo
 planning,planning/budget/uri,Linked budget information,"A URI pointing directly to a machine-readable record about the budget line-item or line-items that fund this contracting process. Information may be provided in a range of formats, including using IATI, the Open Fiscal Data Standard or any other standard which provides structured data on budget sources. Human readable documents can be included using the planning.documents block.",string,0..1,uri,,,
 planning,planning/budget/source,Data Source,"(Deprecated in 1.1) Used to point either to a corresponding Budget Data Package, or to a machine or human-readable source where users can find further information on the budget line item identifiers, or project identifiers, provided here.",string,0..1,uri,,1.1,"The budget data source field was intended to link to machine-readable data about the budget for a contracting process, but has been widely mis-used to provide free-text descriptions of budget providers. As a result, it has been removed from version 1.1. budget/uri can be used to provide a link to machine-readable budget information, and budget/description can be used to provide human-readable information on the budget source."
 planning,planning/documents,Documents,A list of documents related to the planning process.,array,0..n,,,,
-planning,planning/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,planning/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 planning,planning/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,,
 planning,planning/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,,
 planning,planning/documents/title,Title,The document title.,string,0..1,,,,
@@ -83,7 +93,7 @@ planning,planning/documents/dateModified,Date modified,Date that the document wa
 planning,planning/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,,
 planning,planning/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",,
 planning,planning/milestones,Planning milestones,A list of milestones associated with the planning stage.,array,0..n,,,,
-planning,planning/milestones,Milestone,,object,,,,,
+,planning/milestones,Milestone,,object,,,,,
 planning,planning/milestones/id,ID,"A local identifier for this milestone, unique within this block. This field is used to keep track of multiple revisions of a milestone through the compilation from release to record mechanism.","string, integer",1..1,,,,
 planning,planning/milestones/title,Title,Milestone title,string,0..1,,,,
 planning,planning/milestones/type,Milestone type,"The type of milestone, drawn from an extended milestoneType codelist.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-type,,
@@ -94,7 +104,7 @@ planning,planning/milestones/dateMet,Date met,The date on which the milestone wa
 planning,planning/milestones/dateModified,Date modified,The date the milestone was last reviewed or modified and the status was altered or confirmed to still be correct.,string,0..1,date-time,,,
 planning,planning/milestones/status,Status,"The status that was realized on the date provided in dateModified, drawn from the milestoneStatus codelist.",string,0..1,"Codelist: scheduled, met, notMet, partiallyMet",http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-status,,
 planning,planning/milestones/documents,Documents,List of documents associated with this milestone (Deprecated in 1.1).,array,0..n,,,1.1,"Inclusion of documents at the milestone level is now deprecated. Documentation should be attached in the tender, award, contract or implementation sections, and titles and descriptions used to highlight the related milestone. Publishers who wish to continue to provide documents at the milestone level should explicitly declare this by using the milestone documents extension."
-planning,planning/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,planning/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 planning,planning/milestones/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,1.1,
 planning,planning/milestones/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,1.1,
 planning,planning/milestones/documents/title,Title,The document title.,string,0..1,,,1.1,
@@ -104,48 +114,54 @@ planning,planning/milestones/documents/datePublished,Date published,The date on
 planning,planning/milestones/documents/dateModified,Date modified,Date that the document was last modified,string,0..1,date-time,,1.1,
 planning,planning/milestones/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,1.1,
 planning,planning/milestones/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",1.1,
+,tender,Tender,The activities undertaken in order to enter into a contract.,object,0..1,,,,
 ,tender,Tender,Data regarding tender process - publicly inviting prospective contractors to submit bids for evaluation and selecting a winner or winners.,object,0..1,,,,
 tender,tender/id,Tender ID,"An identifier for this tender process. This may be the same as the ocid, or may be drawn from an internally held identifier for this tender.","string, integer",1..1,,,,
 tender,tender/title,Tender title,"A title for this tender. This will often be used by applications as a headline to attract interest, and to help analysts understand the nature of this procurement.",string,0..1,,,,
 tender,tender/description,Tender description,A summary description of the tender. This should complement structured information provided using the items array. Descriptions should be short and easy to read. Avoid using ALL CAPS. ,string,0..1,,,,
 tender,tender/status,Tender status,The current status of the tender based on the tenderStatus codelist,string,0..1,"Codelist: planning, planned, active, cancelled, unsuccessful, complete, withdrawn",http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#tender-status,,
+tender,tender/procuringEntity,Procuring entity,"The entity managing the procurement. This may be different from the buyer who pays for, or uses, the items being procured.",object,0..1,,,,
 tender,tender/procuringEntity,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,0..1,,,,
 tender,tender/procuringEntity/name,Organization name,The name of the party being referenced. This must match the name of an entry in the parties section.,string,1..1,,,,
 tender,tender/procuringEntity/id,Organization ID,The id of the party being referenced. This must match the id of an entry in the parties section.,"string, integer",1..1,,,,
+tender,tender/procuringEntity/identifier,Primary identifier,The primary identifier for this organization. Identifiers that uniquely pick out a legal entity should be preferred. Consult the organization identifier guidance for the preferred scheme and identifier to use.,object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and detailed legal identifier information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 tender,tender/procuringEntity/identifier,Identifier,,object,0..1,,,,
-tender,tender/procuringEntity/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-tender,tender/procuringEntity/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-tender,tender/procuringEntity/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-tender,tender/procuringEntity/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+tender,tender/procuringEntity/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+tender,tender/procuringEntity/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+tender,tender/procuringEntity/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+tender,tender/procuringEntity/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+tender,tender/procuringEntity/address,Address,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and address information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 tender,tender/procuringEntity/address,Address,"An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.",object,0..1,,,,
-tender,tender/procuringEntity/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,,
-tender,tender/procuringEntity/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,,
-tender,tender/procuringEntity/address/region,Region,"The region. For example, CA.",string,0..1,,,,
-tender,tender/procuringEntity/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,,
-tender,tender/procuringEntity/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,,
+tender,tender/procuringEntity/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,1.1,
+tender,tender/procuringEntity/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,1.1,
+tender,tender/procuringEntity/address/region,Region,"The region. For example, CA.",string,0..1,,,1.1,
+tender,tender/procuringEntity/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,1.1,
+tender,tender/procuringEntity/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,1.1,
 tender,tender/procuringEntity/additionalIdentifiers,Additional identifiers,"(Deprecated outside the parties section) A list of additional / supplemental identifiers for the organization, using the organization identifier guidance. This could be used to provide an internally used identifier for this organization in addition to the primary legal entity identifier.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and additional identifiers for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
-tender,tender/procuringEntity/additionalIdentifiers,Identifier,,object,,,,,
+,tender/procuringEntity/additionalIdentifiers,Identifier,,object,,,,,
 tender,tender/procuringEntity/additionalIdentifiers/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
 tender,tender/procuringEntity/additionalIdentifiers/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
 tender,tender/procuringEntity/additionalIdentifiers/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
 tender,tender/procuringEntity/additionalIdentifiers/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+tender,tender/procuringEntity/contactPoint,Contact point,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and contact point information for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 tender,tender/procuringEntity/contactPoint,Contact point,"An person, contact point or department to contact in relation to this contracting process.",object,0..1,,,,
-tender,tender/procuringEntity/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,,
-tender,tender/procuringEntity/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,,
-tender,tender/procuringEntity/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-tender,tender/procuringEntity/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-tender,tender/procuringEntity/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,,
+tender,tender/procuringEntity/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,1.1,
+tender,tender/procuringEntity/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,1.1,
+tender,tender/procuringEntity/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+tender,tender/procuringEntity/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+tender,tender/procuringEntity/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,1.1,
 tender,tender/items,Items to be procured,"The goods and services to be purchased, broken into line items wherever possible. Items should not be duplicated, but a quantity of 2 specified instead.",array,0..n,,,,
-tender,tender/items,Item,"A good, service, or work to be contracted.",object,,,,,
+,tender/items,Item,"A good, service, or work to be contracted.",object,,,,,
 tender,tender/items/id,ID,A local identifier to reference and merge the items by. Must be unique within a given array of items.,"string, integer",1..1,,,,
 tender,tender/items/description,Description,"A description of the goods, services to be provided.",string,0..1,,,,
+tender,tender/items/classification,Classification,"The primary classification for the item. See the itemClassificationScheme to identify preferred classification lists, including CPV and GSIN.",object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 tender,tender/items/classification,Classification,,object,0..1,,,,
 tender,tender/items/classification/scheme,Scheme,"An classification should be drawn from an existing scheme or list of codes. This field is used to indicate the scheme/codelist from which the classification is drawn. For line item classifications, this value should represent an known Item Classification Scheme wherever possible.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 tender,tender/items/classification/id,ID,The classification code drawn from the selected scheme.,"string, integer",0..1,,,,
 tender,tender/items/classification/description,Description,A textual description or title for the code.,string,0..1,,,,
 tender,tender/items/classification/uri,URI,A URI to identify the code. In the event individual URIs are not available for items in the identifier scheme this value should be left blank.,string,0..1,uri,,,
 tender,tender/items/additionalClassifications,Additional classifications,An array of additional classifications for the item. See the itemClassificationScheme codelist for common options to use in OCDS. This may also be used to present codes from an internal classification scheme.,array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
-tender,tender/items/additionalClassifications,Classification,,object,,,,,
+,tender/items/additionalClassifications,Classification,,object,,,,,
 tender,tender/items/additionalClassifications/scheme,Scheme,"An classification should be drawn from an existing scheme or list of codes. This field is used to indicate the scheme/codelist from which the classification is drawn. For line item classifications, this value should represent an known Item Classification Scheme wherever possible.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 tender,tender/items/additionalClassifications/id,ID,The classification code drawn from the selected scheme.,"string, integer",0..1,,,,
 tender,tender/items/additionalClassifications/description,Description,A textual description or title for the code.,string,0..1,,,,
@@ -155,13 +171,16 @@ tender,tender/items/unit,Unit,"A description of the unit in which the supplies,
 tender,tender/items/unit/scheme,Scheme,"The list from which units of measure identifiers are taken. This should be an entry from the options available in the unitClassificationScheme codelist. Use of the scheme 'UNCEFACT' for the UN/CEFACT Recommendation 20 list of 'Codes for Units of Measure Used in International Trade' is recommended, although other options are available.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#unit-classification-scheme,,
 tender,tender/items/unit/id,ID,The identifier from the codelist referenced in the scheme property. Check the codelist for details of how to find and use identifiers from the scheme in use.,string,0..1,,,,
 tender,tender/items/unit/name,Name,Name of the unit.,string,0..1,,,,
+tender,tender/items/unit/value,Value,The monetary value of a single unit.,object,0..1,,,,
 tender,tender/items/unit/value,Value,,object,0..1,,,,
 tender,tender/items/unit/value/amount,Amount,Amount as a number.,number,0..1,,,,
 tender,tender/items/unit/value/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
 tender,tender/items/unit/uri,URI,"If the scheme used provide a machine-readable URI for this unit of measure, this can be given.",string,0..1,uri,,,
+tender,tender/value,Value,The total upper estimated value of the procurement. A negative value indicates that the contracting process may involve payments from the supplier to the buyer (commonly used in concession contracts).,object,0..1,,,,
 tender,tender/value,Value,,object,0..1,,,,
 tender,tender/value/amount,Amount,Amount as a number.,number,0..1,,,,
 tender,tender/value/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
+tender,tender/minValue,Minimum value,The minimum estimated value of the procurement.  A negative value indicates that the contracting process may involve payments from the supplier to the buyer (commonly used in concession contracts).,object,0..1,,,,
 tender,tender/minValue,Value,,object,0..1,,,,
 tender,tender/minValue/amount,Amount,Amount as a number.,number,0..1,,,,
 tender,tender/minValue/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
@@ -174,11 +193,13 @@ tender,tender/awardCriteria,Award criteria,"Specify the award criteria for the p
 tender,tender/awardCriteriaDetails,Award criteria details,Any detailed or further information on the award or selection criteria.,string,0..1,,,,
 tender,tender/submissionMethod,Submission method,"Specify the method by which bids must be submitted, in person, written, or electronic auction. Using the submission method codelist",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#submission-method,,
 tender,tender/submissionMethodDetails,Submission method details,"Any detailed or further information on the submission method. This may include the address, e-mail address or online service to which bids should be submitted, and any special requirements to be followed for submissions.",string,0..1,,,,
+tender,tender/tenderPeriod,Tender period,The period when the tender is open for submissions. The end date is the closing date for tender submissions.,object,0..1,,,,
 tender,tender/tenderPeriod,Period,    ,object,0..1,,,,
 tender,tender/tenderPeriod/startDate,Start date,"The start date for the period. When known, a precise start date must always be provided.",string,0..1,date-time,,,
 tender,tender/tenderPeriod/endDate,End date,"The end date for the period. When known, a precise end date must always be provided.",string,0..1,date-time,,,
 tender,tender/tenderPeriod/maxExtentDate,Maximum extent,"The period cannot be extended beyond this date. This field is optional, and can be used to express the maximum available data for extension or renewal of this period.",string,0..1,date-time,,,
 tender,tender/tenderPeriod/durationInDays,Duration (days),"The maximum duration of this period in days. A user interface may wish to collect or display this data in months or years as appropriate, but should convert it into days when completing this field. This field can be used when exact dates are not known.  Where a startDate and endDate are given, this field is optional, and should reflect the difference between those two days. Where a startDate and maxExtentDate are given, this field is optional, and should reflect the difference between startDate and maxExtentDate.",integer,0..1,,,,
+tender,tender/enquiryPeriod,Enquiry period,"The period during which potential bidders may submit questions and requests for clarification to the entity managing procurement. Details of how to submit enquiries should be provided in attached notices, or in submissionMethodDetails. Structured dates for when responses to questions will be made can be provided using tender milestones.",object,0..1,,,,
 tender,tender/enquiryPeriod,Period,    ,object,0..1,,,,
 tender,tender/enquiryPeriod/startDate,Start date,"The start date for the period. When known, a precise start date must always be provided.",string,0..1,date-time,,,
 tender,tender/enquiryPeriod/endDate,End date,"The end date for the period. When known, a precise end date must always be provided.",string,0..1,date-time,,,
@@ -186,11 +207,13 @@ tender,tender/enquiryPeriod/maxExtentDate,Maximum extent,"The period cannot be e
 tender,tender/enquiryPeriod/durationInDays,Duration (days),"The maximum duration of this period in days. A user interface may wish to collect or display this data in months or years as appropriate, but should convert it into days when completing this field. This field can be used when exact dates are not known.  Where a startDate and endDate are given, this field is optional, and should reflect the difference between those two days. Where a startDate and maxExtentDate are given, this field is optional, and should reflect the difference between startDate and maxExtentDate.",integer,0..1,,,,
 tender,tender/hasEnquiries,Has enquiries?,"A true/false field to indicate whether any enquiries were received during the tender process. Structured information on enquiries that were received, and responses to them, can be provided using the enquiries extension.",boolean,0..1,,,,
 tender,tender/eligibilityCriteria,Eligibility criteria,A description of any eligibility criteria for potential suppliers.,string,0..1,,,,
+tender,tender/awardPeriod,Evaluation and award period,"The period for decision making regarding the contract award. The end date should be the date on which an award decision is due to be finalized. The start date is optional, and may be used to indicate the start of an evaluation period.",object,0..1,,,,
 tender,tender/awardPeriod,Period,    ,object,0..1,,,,
 tender,tender/awardPeriod/startDate,Start date,"The start date for the period. When known, a precise start date must always be provided.",string,0..1,date-time,,,
 tender,tender/awardPeriod/endDate,End date,"The end date for the period. When known, a precise end date must always be provided.",string,0..1,date-time,,,
 tender,tender/awardPeriod/maxExtentDate,Maximum extent,"The period cannot be extended beyond this date. This field is optional, and can be used to express the maximum available data for extension or renewal of this period.",string,0..1,date-time,,,
 tender,tender/awardPeriod/durationInDays,Duration (days),"The maximum duration of this period in days. A user interface may wish to collect or display this data in months or years as appropriate, but should convert it into days when completing this field. This field can be used when exact dates are not known.  Where a startDate and endDate are given, this field is optional, and should reflect the difference between those two days. Where a startDate and maxExtentDate are given, this field is optional, and should reflect the difference between startDate and maxExtentDate.",integer,0..1,,,,
+tender,tender/contractPeriod,Contract period,"The period over which the contract is estimated or required to be active. If the tender does not specify explicit dates, the duration field may be used.",object,0..1,,,,
 tender,tender/contractPeriod,Period,    ,object,0..1,,,,
 tender,tender/contractPeriod/startDate,Start date,"The start date for the period. When known, a precise start date must always be provided.",string,0..1,date-time,,,
 tender,tender/contractPeriod/endDate,End date,"The end date for the period. When known, a precise end date must always be provided.",string,0..1,date-time,,,
@@ -198,34 +221,37 @@ tender,tender/contractPeriod/maxExtentDate,Maximum extent,"The period cannot be
 tender,tender/contractPeriod/durationInDays,Duration (days),"The maximum duration of this period in days. A user interface may wish to collect or display this data in months or years as appropriate, but should convert it into days when completing this field. This field can be used when exact dates are not known.  Where a startDate and endDate are given, this field is optional, and should reflect the difference between those two days. Where a startDate and maxExtentDate are given, this field is optional, and should reflect the difference between startDate and maxExtentDate.",integer,0..1,,,,
 tender,tender/numberOfTenderers,Number of tenderers,The number of parties who submit a bid.,integer,0..1,,,,
 tender,tender/tenderers,Tenderers,All parties who submit a bid on a tender. More detailed information on bids and the bidding organization can be provided using the optional bid extension.,array,0..n,,,,
-tender,tender/tenderers,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,,,,,
+,tender/tenderers,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,,,,,
 tender,tender/tenderers/name,Organization name,The name of the party being referenced. This must match the name of an entry in the parties section.,string,1..1,,,,
 tender,tender/tenderers/id,Organization ID,The id of the party being referenced. This must match the id of an entry in the parties section.,"string, integer",1..1,,,,
+tender,tender/tenderers/identifier,Primary identifier,The primary identifier for this organization. Identifiers that uniquely pick out a legal entity should be preferred. Consult the organization identifier guidance for the preferred scheme and identifier to use.,object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and detailed legal identifier information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 tender,tender/tenderers/identifier,Identifier,,object,0..1,,,,
-tender,tender/tenderers/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-tender,tender/tenderers/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-tender,tender/tenderers/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-tender,tender/tenderers/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+tender,tender/tenderers/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+tender,tender/tenderers/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+tender,tender/tenderers/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+tender,tender/tenderers/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+tender,tender/tenderers/address,Address,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and address information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 tender,tender/tenderers/address,Address,"An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.",object,0..1,,,,
-tender,tender/tenderers/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,,
-tender,tender/tenderers/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,,
-tender,tender/tenderers/address/region,Region,"The region. For example, CA.",string,0..1,,,,
-tender,tender/tenderers/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,,
-tender,tender/tenderers/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,,
+tender,tender/tenderers/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,1.1,
+tender,tender/tenderers/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,1.1,
+tender,tender/tenderers/address/region,Region,"The region. For example, CA.",string,0..1,,,1.1,
+tender,tender/tenderers/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,1.1,
+tender,tender/tenderers/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,1.1,
 tender,tender/tenderers/additionalIdentifiers,Additional identifiers,"(Deprecated outside the parties section) A list of additional / supplemental identifiers for the organization, using the organization identifier guidance. This could be used to provide an internally used identifier for this organization in addition to the primary legal entity identifier.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and additional identifiers for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
-tender,tender/tenderers/additionalIdentifiers,Identifier,,object,,,,,
+,tender/tenderers/additionalIdentifiers,Identifier,,object,,,,,
 tender,tender/tenderers/additionalIdentifiers/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
 tender,tender/tenderers/additionalIdentifiers/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
 tender,tender/tenderers/additionalIdentifiers/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
 tender,tender/tenderers/additionalIdentifiers/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+tender,tender/tenderers/contactPoint,Contact point,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and contact point information for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 tender,tender/tenderers/contactPoint,Contact point,"An person, contact point or department to contact in relation to this contracting process.",object,0..1,,,,
-tender,tender/tenderers/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,,
-tender,tender/tenderers/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,,
-tender,tender/tenderers/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-tender,tender/tenderers/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-tender,tender/tenderers/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,,
+tender,tender/tenderers/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,1.1,
+tender,tender/tenderers/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,1.1,
+tender,tender/tenderers/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+tender,tender/tenderers/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+tender,tender/tenderers/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,1.1,
 tender,tender/documents,Documents,"All documents and attachments related to the tender, including any notices. See the documentType codelist for details of potential documents to include. Common documents include official legal notices of tender, technical specifications, evaluation criteria, and, as a tender process progresses, clarifications and replies to queries.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,,
-tender,tender/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,tender/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 tender,tender/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,,
 tender,tender/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,,
 tender,tender/documents/title,Title,The document title.,string,0..1,,,,
@@ -236,7 +262,7 @@ tender,tender/documents/dateModified,Date modified,Date that the document was la
 tender,tender/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,,
 tender,tender/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",,
 tender,tender/milestones,Milestones,A list of milestones associated with the tender.,array,0..n,,,,
-tender,tender/milestones,Milestone,,object,,,,,
+,tender/milestones,Milestone,,object,,,,,
 tender,tender/milestones/id,ID,"A local identifier for this milestone, unique within this block. This field is used to keep track of multiple revisions of a milestone through the compilation from release to record mechanism.","string, integer",1..1,,,,
 tender,tender/milestones/title,Title,Milestone title,string,0..1,,,,
 tender,tender/milestones/type,Milestone type,"The type of milestone, drawn from an extended milestoneType codelist.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-type,,
@@ -247,7 +273,7 @@ tender,tender/milestones/dateMet,Date met,The date on which the milestone was me
 tender,tender/milestones/dateModified,Date modified,The date the milestone was last reviewed or modified and the status was altered or confirmed to still be correct.,string,0..1,date-time,,,
 tender,tender/milestones/status,Status,"The status that was realized on the date provided in dateModified, drawn from the milestoneStatus codelist.",string,0..1,"Codelist: scheduled, met, notMet, partiallyMet",http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-status,,
 tender,tender/milestones/documents,Documents,List of documents associated with this milestone (Deprecated in 1.1).,array,0..n,,,1.1,"Inclusion of documents at the milestone level is now deprecated. Documentation should be attached in the tender, award, contract or implementation sections, and titles and descriptions used to highlight the related milestone. Publishers who wish to continue to provide documents at the milestone level should explicitly declare this by using the milestone documents extension."
-tender,tender/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,tender/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 tender,tender/milestones/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,1.1,
 tender,tender/milestones/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,1.1,
 tender,tender/milestones/documents/title,Title,The document title.,string,0..1,,,1.1,
@@ -258,7 +284,7 @@ tender,tender/milestones/documents/dateModified,Date modified,Date that the docu
 tender,tender/milestones/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,1.1,
 tender,tender/milestones/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",1.1,
 tender,tender/amendments,Amendments,"A tender amendment is a formal change to the tender, and generally involves the publication of a new tender notice/release. The rationale and a description of the changes made can be provided here.",array,0..n,,,,
-tender,tender/amendments,Amendment,Amendment information,object,,,,,
+,tender/amendments,Amendment,Amendment information,object,,,,,
 tender,tender/amendments/date,Amendment date,The date of this amendment.,string,0..1,date-time,,,
 tender,tender/amendments/rationale,Rationale,An explanation for the amendment.,string,0..1,,,,
 tender,tender/amendments/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,,
@@ -268,13 +294,14 @@ tender,tender/amendments/releaseID,Amending release (identifier),Provide the ide
 tender,tender/amendments/changes,Amended fields,"An array change objects describing the fields changed, and their former values. (Deprecated in 1.1)",array,0..n,,,1.1,"A free-text or semi-structured string describing the changes made in each amendment can be provided in the amendment.description field. To provide structured information on the fields that have changed, publishers should provide releases indicating the state of the contracting process before and after the amendment.  "
 tender,tender/amendments/changes/property,Property,"The property name that has been changed relative to the place the amendment is. For example if the contract value has changed, then the property under changes within the contract.amendment would be value.amount. (Deprecated in 1.1)",string,1..1,,,1.1,
 tender,tender/amendments/changes/former_value,Former Value,"The previous value of the changed property, in whatever type the property is. (Deprecated in 1.1)","string, number, integer, array, object",0..1,,,1.1,
+tender,tender/amendment,Amendment,The use of individual amendment objects has been deprecated. From OCDS 1.1 information should be provided in the amendments array.,object,0..1,,,1.1,The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.
 tender,tender/amendment,Amendment,Amendment information,object,0..1,,,,
-tender,tender/amendment/date,Amendment date,The date of this amendment.,string,0..1,date-time,,,
-tender,tender/amendment/rationale,Rationale,An explanation for the amendment.,string,0..1,,,,
-tender,tender/amendment/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,,
-tender,tender/amendment/description,Description,"A free text, or semi-structured, description of the changes made in this amendment.",string,0..1,,,,
-tender,tender/amendment/amendsReleaseID,Amended release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **before** the amendment was made.,string,0..1,,,,
-tender,tender/amendment/releaseID,Amending release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **after** the amendment was made.,string,0..1,,,,
+tender,tender/amendment/date,Amendment date,The date of this amendment.,string,0..1,date-time,,1.1,
+tender,tender/amendment/rationale,Rationale,An explanation for the amendment.,string,0..1,,,1.1,
+tender,tender/amendment/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,1.1,
+tender,tender/amendment/description,Description,"A free text, or semi-structured, description of the changes made in this amendment.",string,0..1,,,1.1,
+tender,tender/amendment/amendsReleaseID,Amended release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **before** the amendment was made.,string,0..1,,,1.1,
+tender,tender/amendment/releaseID,Amending release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **after** the amendment was made.,string,0..1,,,1.1,
 tender,tender/amendment/changes,Amended fields,"An array change objects describing the fields changed, and their former values. (Deprecated in 1.1)",array,0..n,,,1.1,"A free-text or semi-structured string describing the changes made in each amendment can be provided in the amendment.description field. To provide structured information on the fields that have changed, publishers should provide releases indicating the state of the contracting process before and after the amendment.  "
 tender,tender/amendment/changes/property,Property,"The property name that has been changed relative to the place the amendment is. For example if the contract value has changed, then the property under changes within the contract.amendment would be value.amount. (Deprecated in 1.1)",string,1..1,,,1.1,
 tender,tender/amendment/changes/former_value,Former Value,"The previous value of the changed property, in whatever type the property is. (Deprecated in 1.1)","string, number, integer, array, object",0..1,,,1.1,
@@ -285,47 +312,52 @@ awards,awards/title,Title,Award title,string,0..1,,,,
 awards,awards/description,Description,Award description,string,0..1,,,,
 awards,awards/status,Award status,The current status of the award drawn from the awardStatus codelist,string,0..1,"Codelist: pending, active, cancelled, unsuccessful",http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#award-status,,
 awards,awards/date,Award date,The date of the contract award. This is usually the date on which a decision to award was made.,string,0..1,date-time,,,
+awards,awards/value,Value,"The total value of this award. In the case of a framework contract this may be the total estimated lifetime value, or maximum value, of the agreement. There may be more than one award per procurement. A negative value indicates that the award may involve payments from the supplier to the buyer (commonly used in concession contracts).",object,0..1,,,,
 awards,awards/value,Value,,object,0..1,,,,
 awards,awards/value/amount,Amount,Amount as a number.,number,0..1,,,,
 awards,awards/value/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
 awards,awards/suppliers,Suppliers,"The suppliers awarded this award. If different suppliers have been awarded different items of values, these should be split into separate award blocks.",array,0..n,,,,
-awards,awards/suppliers,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,,,,,
+,awards/suppliers,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,,,,,
 awards,awards/suppliers/name,Organization name,The name of the party being referenced. This must match the name of an entry in the parties section.,string,1..1,,,,
 awards,awards/suppliers/id,Organization ID,The id of the party being referenced. This must match the id of an entry in the parties section.,"string, integer",1..1,,,,
+awards,awards/suppliers/identifier,Primary identifier,The primary identifier for this organization. Identifiers that uniquely pick out a legal entity should be preferred. Consult the organization identifier guidance for the preferred scheme and identifier to use.,object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and detailed legal identifier information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 awards,awards/suppliers/identifier,Identifier,,object,0..1,,,,
-awards,awards/suppliers/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-awards,awards/suppliers/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-awards,awards/suppliers/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-awards,awards/suppliers/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+awards,awards/suppliers/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+awards,awards/suppliers/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+awards,awards/suppliers/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+awards,awards/suppliers/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+awards,awards/suppliers/address,Address,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and address information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 awards,awards/suppliers/address,Address,"An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.",object,0..1,,,,
-awards,awards/suppliers/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,,
-awards,awards/suppliers/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,,
-awards,awards/suppliers/address/region,Region,"The region. For example, CA.",string,0..1,,,,
-awards,awards/suppliers/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,,
-awards,awards/suppliers/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,,
+awards,awards/suppliers/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,1.1,
+awards,awards/suppliers/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,1.1,
+awards,awards/suppliers/address/region,Region,"The region. For example, CA.",string,0..1,,,1.1,
+awards,awards/suppliers/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,1.1,
+awards,awards/suppliers/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,1.1,
 awards,awards/suppliers/additionalIdentifiers,Additional identifiers,"(Deprecated outside the parties section) A list of additional / supplemental identifiers for the organization, using the organization identifier guidance. This could be used to provide an internally used identifier for this organization in addition to the primary legal entity identifier.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and additional identifiers for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
-awards,awards/suppliers/additionalIdentifiers,Identifier,,object,,,,,
+,awards/suppliers/additionalIdentifiers,Identifier,,object,,,,,
 awards,awards/suppliers/additionalIdentifiers/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
 awards,awards/suppliers/additionalIdentifiers/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
 awards,awards/suppliers/additionalIdentifiers/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
 awards,awards/suppliers/additionalIdentifiers/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+awards,awards/suppliers/contactPoint,Contact point,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and contact point information for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 awards,awards/suppliers/contactPoint,Contact point,"An person, contact point or department to contact in relation to this contracting process.",object,0..1,,,,
-awards,awards/suppliers/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,,
-awards,awards/suppliers/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,,
-awards,awards/suppliers/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-awards,awards/suppliers/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-awards,awards/suppliers/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,,
+awards,awards/suppliers/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,1.1,
+awards,awards/suppliers/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,1.1,
+awards,awards/suppliers/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+awards,awards/suppliers/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+awards,awards/suppliers/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,1.1,
 awards,awards/items,Items awarded,"The goods and services awarded in this award, broken into line items wherever possible. Items should not be duplicated, but the quantity specified instead.",array,0..n,,,,
-awards,awards/items,Item,"A good, service, or work to be contracted.",object,,,,,
+,awards/items,Item,"A good, service, or work to be contracted.",object,,,,,
 awards,awards/items/id,ID,A local identifier to reference and merge the items by. Must be unique within a given array of items.,"string, integer",1..1,,,,
 awards,awards/items/description,Description,"A description of the goods, services to be provided.",string,0..1,,,,
+awards,awards/items/classification,Classification,"The primary classification for the item. See the itemClassificationScheme to identify preferred classification lists, including CPV and GSIN.",object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 awards,awards/items/classification,Classification,,object,0..1,,,,
 awards,awards/items/classification/scheme,Scheme,"An classification should be drawn from an existing scheme or list of codes. This field is used to indicate the scheme/codelist from which the classification is drawn. For line item classifications, this value should represent an known Item Classification Scheme wherever possible.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 awards,awards/items/classification/id,ID,The classification code drawn from the selected scheme.,"string, integer",0..1,,,,
 awards,awards/items/classification/description,Description,A textual description or title for the code.,string,0..1,,,,
 awards,awards/items/classification/uri,URI,A URI to identify the code. In the event individual URIs are not available for items in the identifier scheme this value should be left blank.,string,0..1,uri,,,
 awards,awards/items/additionalClassifications,Additional classifications,An array of additional classifications for the item. See the itemClassificationScheme codelist for common options to use in OCDS. This may also be used to present codes from an internal classification scheme.,array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
-awards,awards/items/additionalClassifications,Classification,,object,,,,,
+,awards/items/additionalClassifications,Classification,,object,,,,,
 awards,awards/items/additionalClassifications/scheme,Scheme,"An classification should be drawn from an existing scheme or list of codes. This field is used to indicate the scheme/codelist from which the classification is drawn. For line item classifications, this value should represent an known Item Classification Scheme wherever possible.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 awards,awards/items/additionalClassifications/id,ID,The classification code drawn from the selected scheme.,"string, integer",0..1,,,,
 awards,awards/items/additionalClassifications/description,Description,A textual description or title for the code.,string,0..1,,,,
@@ -335,17 +367,19 @@ awards,awards/items/unit,Unit,"A description of the unit in which the supplies,
 awards,awards/items/unit/scheme,Scheme,"The list from which units of measure identifiers are taken. This should be an entry from the options available in the unitClassificationScheme codelist. Use of the scheme 'UNCEFACT' for the UN/CEFACT Recommendation 20 list of 'Codes for Units of Measure Used in International Trade' is recommended, although other options are available.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#unit-classification-scheme,,
 awards,awards/items/unit/id,ID,The identifier from the codelist referenced in the scheme property. Check the codelist for details of how to find and use identifiers from the scheme in use.,string,0..1,,,,
 awards,awards/items/unit/name,Name,Name of the unit.,string,0..1,,,,
+awards,awards/items/unit/value,Value,The monetary value of a single unit.,object,0..1,,,,
 awards,awards/items/unit/value,Value,,object,0..1,,,,
 awards,awards/items/unit/value/amount,Amount,Amount as a number.,number,0..1,,,,
 awards,awards/items/unit/value/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
 awards,awards/items/unit/uri,URI,"If the scheme used provide a machine-readable URI for this unit of measure, this can be given.",string,0..1,uri,,,
+awards,awards/contractPeriod,Contract period,The period for which the contract has been awarded.,object,0..1,,,,
 awards,awards/contractPeriod,Period,    ,object,0..1,,,,
 awards,awards/contractPeriod/startDate,Start date,"The start date for the period. When known, a precise start date must always be provided.",string,0..1,date-time,,,
 awards,awards/contractPeriod/endDate,End date,"The end date for the period. When known, a precise end date must always be provided.",string,0..1,date-time,,,
 awards,awards/contractPeriod/maxExtentDate,Maximum extent,"The period cannot be extended beyond this date. This field is optional, and can be used to express the maximum available data for extension or renewal of this period.",string,0..1,date-time,,,
 awards,awards/contractPeriod/durationInDays,Duration (days),"The maximum duration of this period in days. A user interface may wish to collect or display this data in months or years as appropriate, but should convert it into days when completing this field. This field can be used when exact dates are not known.  Where a startDate and endDate are given, this field is optional, and should reflect the difference between those two days. Where a startDate and maxExtentDate are given, this field is optional, and should reflect the difference between startDate and maxExtentDate.",integer,0..1,,,,
 awards,awards/documents,Documents,"All documents and attachments related to the award, including any notices.",array,0..n,,,,
-awards,awards/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,awards/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 awards,awards/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,,
 awards,awards/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,,
 awards,awards/documents/title,Title,The document title.,string,0..1,,,,
@@ -356,7 +390,7 @@ awards,awards/documents/dateModified,Date modified,Date that the document was la
 awards,awards/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,,
 awards,awards/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",,
 awards,awards/amendments,Amendments,"An award amendment is a formal change to the details of the award, and generally involves the publication of a new award notice/release. The rationale and a description of the changes made can be provided here.",array,0..n,,,,
-awards,awards/amendments,Amendment,Amendment information,object,,,,,
+,awards/amendments,Amendment,Amendment information,object,,,,,
 awards,awards/amendments/date,Amendment date,The date of this amendment.,string,0..1,date-time,,,
 awards,awards/amendments/rationale,Rationale,An explanation for the amendment.,string,0..1,,,,
 awards,awards/amendments/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,,
@@ -366,13 +400,14 @@ awards,awards/amendments/releaseID,Amending release (identifier),Provide the ide
 awards,awards/amendments/changes,Amended fields,"An array change objects describing the fields changed, and their former values. (Deprecated in 1.1)",array,0..n,,,1.1,"A free-text or semi-structured string describing the changes made in each amendment can be provided in the amendment.description field. To provide structured information on the fields that have changed, publishers should provide releases indicating the state of the contracting process before and after the amendment.  "
 awards,awards/amendments/changes/property,Property,"The property name that has been changed relative to the place the amendment is. For example if the contract value has changed, then the property under changes within the contract.amendment would be value.amount. (Deprecated in 1.1)",string,1..1,,,1.1,
 awards,awards/amendments/changes/former_value,Former Value,"The previous value of the changed property, in whatever type the property is. (Deprecated in 1.1)","string, number, integer, array, object",0..1,,,1.1,
+awards,awards/amendment,Amendment,The use of individual amendment objects has been deprecated. From OCDS 1.1 information should be provided in the amendments array.,object,0..1,,,1.1,The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.
 awards,awards/amendment,Amendment,Amendment information,object,0..1,,,,
-awards,awards/amendment/date,Amendment date,The date of this amendment.,string,0..1,date-time,,,
-awards,awards/amendment/rationale,Rationale,An explanation for the amendment.,string,0..1,,,,
-awards,awards/amendment/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,,
-awards,awards/amendment/description,Description,"A free text, or semi-structured, description of the changes made in this amendment.",string,0..1,,,,
-awards,awards/amendment/amendsReleaseID,Amended release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **before** the amendment was made.,string,0..1,,,,
-awards,awards/amendment/releaseID,Amending release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **after** the amendment was made.,string,0..1,,,,
+awards,awards/amendment/date,Amendment date,The date of this amendment.,string,0..1,date-time,,1.1,
+awards,awards/amendment/rationale,Rationale,An explanation for the amendment.,string,0..1,,,1.1,
+awards,awards/amendment/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,1.1,
+awards,awards/amendment/description,Description,"A free text, or semi-structured, description of the changes made in this amendment.",string,0..1,,,1.1,
+awards,awards/amendment/amendsReleaseID,Amended release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **before** the amendment was made.,string,0..1,,,1.1,
+awards,awards/amendment/releaseID,Amending release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **after** the amendment was made.,string,0..1,,,1.1,
 awards,awards/amendment/changes,Amended fields,"An array change objects describing the fields changed, and their former values. (Deprecated in 1.1)",array,0..n,,,1.1,"A free-text or semi-structured string describing the changes made in each amendment can be provided in the amendment.description field. To provide structured information on the fields that have changed, publishers should provide releases indicating the state of the contracting process before and after the amendment.  "
 awards,awards/amendment/changes/property,Property,"The property name that has been changed relative to the place the amendment is. For example if the contract value has changed, then the property under changes within the contract.amendment would be value.amount. (Deprecated in 1.1)",string,1..1,,,1.1,
 awards,awards/amendment/changes/former_value,Former Value,"The previous value of the changed property, in whatever type the property is. (Deprecated in 1.1)","string, number, integer, array, object",0..1,,,1.1,
@@ -383,25 +418,28 @@ contracts,contracts/awardID,Award ID,The award.id against which this contract is
 contracts,contracts/title,Contract title,Contract title,string,0..1,,,,
 contracts,contracts/description,Contract description,Contract description,string,0..1,,,,
 contracts,contracts/status,Contract status,The current status of the contract. Drawn from the contractStatus codelist,string,0..1,"Codelist: pending, active, cancelled, terminated",http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#contract-status,,
+contracts,contracts/period,Period,The start and end date for the contract.,object,0..1,,,,
 contracts,contracts/period,Period,    ,object,0..1,,,,
 contracts,contracts/period/startDate,Start date,"The start date for the period. When known, a precise start date must always be provided.",string,0..1,date-time,,,
 contracts,contracts/period/endDate,End date,"The end date for the period. When known, a precise end date must always be provided.",string,0..1,date-time,,,
 contracts,contracts/period/maxExtentDate,Maximum extent,"The period cannot be extended beyond this date. This field is optional, and can be used to express the maximum available data for extension or renewal of this period.",string,0..1,date-time,,,
 contracts,contracts/period/durationInDays,Duration (days),"The maximum duration of this period in days. A user interface may wish to collect or display this data in months or years as appropriate, but should convert it into days when completing this field. This field can be used when exact dates are not known.  Where a startDate and endDate are given, this field is optional, and should reflect the difference between those two days. Where a startDate and maxExtentDate are given, this field is optional, and should reflect the difference between startDate and maxExtentDate.",integer,0..1,,,,
+contracts,contracts/value,Value,The total value of this contract. A negative value indicates that the contract will involve payments from the supplier to the buyer (commonly used in concession contracts).,object,0..1,,,,
 contracts,contracts/value,Value,,object,0..1,,,,
 contracts,contracts/value/amount,Amount,Amount as a number.,number,0..1,,,,
 contracts,contracts/value/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
 contracts,contracts/items,Items contracted,"The goods, services, and any intangible outcomes in this contract. Note: If the items are the same as the award do not repeat.",array,0..n,,,,
-contracts,contracts/items,Item,"A good, service, or work to be contracted.",object,,,,,
+,contracts/items,Item,"A good, service, or work to be contracted.",object,,,,,
 contracts,contracts/items/id,ID,A local identifier to reference and merge the items by. Must be unique within a given array of items.,"string, integer",1..1,,,,
 contracts,contracts/items/description,Description,"A description of the goods, services to be provided.",string,0..1,,,,
+contracts,contracts/items/classification,Classification,"The primary classification for the item. See the itemClassificationScheme to identify preferred classification lists, including CPV and GSIN.",object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 contracts,contracts/items/classification,Classification,,object,0..1,,,,
 contracts,contracts/items/classification/scheme,Scheme,"An classification should be drawn from an existing scheme or list of codes. This field is used to indicate the scheme/codelist from which the classification is drawn. For line item classifications, this value should represent an known Item Classification Scheme wherever possible.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 contracts,contracts/items/classification/id,ID,The classification code drawn from the selected scheme.,"string, integer",0..1,,,,
 contracts,contracts/items/classification/description,Description,A textual description or title for the code.,string,0..1,,,,
 contracts,contracts/items/classification/uri,URI,A URI to identify the code. In the event individual URIs are not available for items in the identifier scheme this value should be left blank.,string,0..1,uri,,,
 contracts,contracts/items/additionalClassifications,Additional classifications,An array of additional classifications for the item. See the itemClassificationScheme codelist for common options to use in OCDS. This may also be used to present codes from an internal classification scheme.,array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
-contracts,contracts/items/additionalClassifications,Classification,,object,,,,,
+,contracts/items/additionalClassifications,Classification,,object,,,,,
 contracts,contracts/items/additionalClassifications/scheme,Scheme,"An classification should be drawn from an existing scheme or list of codes. This field is used to indicate the scheme/codelist from which the classification is drawn. For line item classifications, this value should represent an known Item Classification Scheme wherever possible.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#item-classification-scheme,,
 contracts,contracts/items/additionalClassifications/id,ID,The classification code drawn from the selected scheme.,"string, integer",0..1,,,,
 contracts,contracts/items/additionalClassifications/description,Description,A textual description or title for the code.,string,0..1,,,,
@@ -411,13 +449,14 @@ contracts,contracts/items/unit,Unit,"A description of the unit in which the supp
 contracts,contracts/items/unit/scheme,Scheme,"The list from which units of measure identifiers are taken. This should be an entry from the options available in the unitClassificationScheme codelist. Use of the scheme 'UNCEFACT' for the UN/CEFACT Recommendation 20 list of 'Codes for Units of Measure Used in International Trade' is recommended, although other options are available.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#unit-classification-scheme,,
 contracts,contracts/items/unit/id,ID,The identifier from the codelist referenced in the scheme property. Check the codelist for details of how to find and use identifiers from the scheme in use.,string,0..1,,,,
 contracts,contracts/items/unit/name,Name,Name of the unit.,string,0..1,,,,
+contracts,contracts/items/unit/value,Value,The monetary value of a single unit.,object,0..1,,,,
 contracts,contracts/items/unit/value,Value,,object,0..1,,,,
 contracts,contracts/items/unit/value/amount,Amount,Amount as a number.,number,0..1,,,,
 contracts,contracts/items/unit/value/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
 contracts,contracts/items/unit/uri,URI,"If the scheme used provide a machine-readable URI for this unit of measure, this can be given.",string,0..1,uri,,,
 contracts,contracts/dateSigned,Date signed,"The date the contract was signed. In the case of multiple signatures, the date of the last signature.",string,0..1,date-time,,,
 contracts,contracts/documents,Documents,"All documents and attachments related to the contract, including any notices.",array,0..n,,,,
-contracts,contracts/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,contracts/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 contracts,contracts/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,,
 contracts,contracts/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,,
 contracts,contracts/documents/title,Title,The document title.,string,0..1,,,,
@@ -427,83 +466,96 @@ contracts,contracts/documents/datePublished,Date published,The date on which the
 contracts,contracts/documents/dateModified,Date modified,Date that the document was last modified,string,0..1,date-time,,,
 contracts,contracts/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,,
 contracts,contracts/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",,
+contracts,contracts/implementation,Implementation,Information related to the implementation of the contract in accordance with the obligations laid out therein.,object,0..1,,,,
 contracts,contracts/implementation,Implementation,Information during the performance / implementation stage of the contract.,object,0..1,,,,
 contracts,contracts/implementation/transactions,Transactions,A list of the spending transactions made against this contract,array,0..n,,,,
-contracts,contracts/implementation/transactions,Transaction information,"A spending transaction related to the contracting process. Draws upon the data models of the [Fiscal Data Package](http://fiscal.dataprotocols.org/) and the [International Aid Transparency Initiative](http://iatistandard.org/activity-standard/iati-activities/iati-activity/transaction/) and should be used to cross-reference to more detailed information held using a Fiscal Data Package, IATI file, or to provide enough information to allow a user to manually or automatically cross-reference with some other published source of transactional spending data.",object,,,,,
+,contracts/implementation/transactions,Transaction information,"A spending transaction related to the contracting process. Draws upon the data models of the [Fiscal Data Package](http://fiscal.dataprotocols.org/) and the [International Aid Transparency Initiative](http://iatistandard.org/activity-standard/iati-activities/iati-activity/transaction/) and should be used to cross-reference to more detailed information held using a Fiscal Data Package, IATI file, or to provide enough information to allow a user to manually or automatically cross-reference with some other published source of transactional spending data.",object,,,,,
 contracts,contracts/implementation/transactions/id,ID,A unique identifier for this transaction. This identifier should be possible to cross-reference against the provided data source. For IATI this is the transaction reference.,"string, integer",1..1,,,,
 contracts,contracts/implementation/transactions/source,Data source,"Used to point either to a corresponding Fiscal Data Package, IATI file, or machine or human-readable source where users can find further information on the budget line item identifiers, or project identifiers, provided here.",string,0..1,uri,,,
 contracts,contracts/implementation/transactions/date,Date,The date of the transaction,string,0..1,date-time,,,
+contracts,contracts/implementation/transactions/value,Value,The value of the transaction.,object,0..1,,,,
 contracts,contracts/implementation/transactions/value,Value,,object,0..1,,,,
 contracts,contracts/implementation/transactions/value/amount,Amount,Amount as a number.,number,0..1,,,,
 contracts,contracts/implementation/transactions/value/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
+contracts,contracts/implementation/transactions/payer,Payer,An organization reference for the organization from which the funds in this transaction originate.,object,0..1,,,,
 contracts,contracts/implementation/transactions/payer,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,0..1,,,,
 contracts,contracts/implementation/transactions/payer/name,Organization name,The name of the party being referenced. This must match the name of an entry in the parties section.,string,1..1,,,,
 contracts,contracts/implementation/transactions/payer/id,Organization ID,The id of the party being referenced. This must match the id of an entry in the parties section.,"string, integer",1..1,,,,
+contracts,contracts/implementation/transactions/payer/identifier,Primary identifier,The primary identifier for this organization. Identifiers that uniquely pick out a legal entity should be preferred. Consult the organization identifier guidance for the preferred scheme and identifier to use.,object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and detailed legal identifier information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 contracts,contracts/implementation/transactions/payer/identifier,Identifier,,object,0..1,,,,
-contracts,contracts/implementation/transactions/payer/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-contracts,contracts/implementation/transactions/payer/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-contracts,contracts/implementation/transactions/payer/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+contracts,contracts/implementation/transactions/payer/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+contracts,contracts/implementation/transactions/payer/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+contracts,contracts/implementation/transactions/payer/address,Address,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and address information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 contracts,contracts/implementation/transactions/payer/address,Address,"An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.",object,0..1,,,,
-contracts,contracts/implementation/transactions/payer/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/address/region,Region,"The region. For example, CA.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,,
+contracts,contracts/implementation/transactions/payer/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/address/region,Region,"The region. For example, CA.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,1.1,
 contracts,contracts/implementation/transactions/payer/additionalIdentifiers,Additional identifiers,"(Deprecated outside the parties section) A list of additional / supplemental identifiers for the organization, using the organization identifier guidance. This could be used to provide an internally used identifier for this organization in addition to the primary legal entity identifier.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and additional identifiers for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
-contracts,contracts/implementation/transactions/payer/additionalIdentifiers,Identifier,,object,,,,,
+,contracts/implementation/transactions/payer/additionalIdentifiers,Identifier,,object,,,,,
 contracts,contracts/implementation/transactions/payer/additionalIdentifiers/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
 contracts,contracts/implementation/transactions/payer/additionalIdentifiers/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
 contracts,contracts/implementation/transactions/payer/additionalIdentifiers/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
 contracts,contracts/implementation/transactions/payer/additionalIdentifiers/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+contracts,contracts/implementation/transactions/payer/contactPoint,Contact point,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and contact point information for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 contracts,contracts/implementation/transactions/payer/contactPoint,Contact point,"An person, contact point or department to contact in relation to this contracting process.",object,0..1,,,,
-contracts,contracts/implementation/transactions/payer/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payer/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,,
+contracts,contracts/implementation/transactions/payer/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payer/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,1.1,
+contracts,contracts/implementation/transactions/payee,Payee,An organization reference for the organization which receives the funds in this transaction.,object,0..1,,,,
 contracts,contracts/implementation/transactions/payee,Organization reference,The id and name of the party being referenced. Used to cross-reference to the parties section,object,0..1,,,,
 contracts,contracts/implementation/transactions/payee/name,Organization name,The name of the party being referenced. This must match the name of an entry in the parties section.,string,1..1,,,,
 contracts,contracts/implementation/transactions/payee/id,Organization ID,The id of the party being referenced. This must match the id of an entry in the parties section.,"string, integer",1..1,,,,
+contracts,contracts/implementation/transactions/payee/identifier,Primary identifier,The primary identifier for this organization. Identifiers that uniquely pick out a legal entity should be preferred. Consult the organization identifier guidance for the preferred scheme and identifier to use.,object,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and detailed legal identifier information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 contracts,contracts/implementation/transactions/payee/identifier,Identifier,,object,0..1,,,,
-contracts,contracts/implementation/transactions/payee/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-contracts,contracts/implementation/transactions/payee/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-contracts,contracts/implementation/transactions/payee/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+contracts,contracts/implementation/transactions/payee/identifier/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+contracts,contracts/implementation/transactions/payee/identifier/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/identifier/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/identifier/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+contracts,contracts/implementation/transactions/payee/address,Address,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and address information should only be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 contracts,contracts/implementation/transactions/payee/address,Address,"An address. This may be the legally registered address of the organization, or may be a correspondence address for this particular contracting process.",object,0..1,,,,
-contracts,contracts/implementation/transactions/payee/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/address/region,Region,"The region. For example, CA.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,,
+contracts,contracts/implementation/transactions/payee/address/streetAddress,Street address,"The street address. For example, 1600 Amphitheatre Pkwy.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/address/locality,Locality,"The locality. For example, Mountain View.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/address/region,Region,"The region. For example, CA.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/address/postalCode,Postal code,"The postal code. For example, 94043.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/address/countryName,Country name,"The country name. For example, United States.",string,0..1,,,1.1,
 contracts,contracts/implementation/transactions/payee/additionalIdentifiers,Additional identifiers,"(Deprecated outside the parties section) A list of additional / supplemental identifiers for the organization, using the organization identifier guidance. This could be used to provide an internally used identifier for this organization in addition to the primary legal entity identifier.",array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/identifiers/,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and additional identifiers for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
-contracts,contracts/implementation/transactions/payee/additionalIdentifiers,Identifier,,object,,,,,
+,contracts/implementation/transactions/payee/additionalIdentifiers,Identifier,,object,,,,,
 contracts,contracts/implementation/transactions/payee/additionalIdentifiers/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
 contracts,contracts/implementation/transactions/payee/additionalIdentifiers/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
 contracts,contracts/implementation/transactions/payee/additionalIdentifiers/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
 contracts,contracts/implementation/transactions/payee/additionalIdentifiers/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+contracts,contracts/implementation/transactions/payee/contactPoint,Contact point,(Deprecated outside the parties section),object,0..1,,,1.1,"From version 1.1, organizations should be referenced by their identifier and name in a document, and contact point information for an organization should be provided in the relevant cross-referenced entry in the parties section at the top level of a release."
 contracts,contracts/implementation/transactions/payee/contactPoint,Contact point,"An person, contact point or department to contact in relation to this contracting process.",object,0..1,,,,
-contracts,contracts/implementation/transactions/payee/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,,
-contracts,contracts/implementation/transactions/payee/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,,
+contracts,contracts/implementation/transactions/payee/contactPoint/name,Name,"The name of the contact person, department, or contact point, for correspondence relating to this contracting process.",string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/contactPoint/email,Email,The e-mail address of the contact point/person.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/contactPoint/telephone,Telephone,The telephone number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/contactPoint/faxNumber,Fax number,The fax number of the contact point/person. This should include the international dialing code.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/payee/contactPoint/url,URL,A web address for the contact point/person.,string,0..1,uri,,1.1,
 contracts,contracts/implementation/transactions/uri,Linked spending information,A URI pointing directly to a machine-readable record about this spending transaction.,string,0..1,uri,,,
+contracts,contracts/implementation/transactions/amount,Amount,(Deprecated in 1.1. Use transaction.value instead) The value of the transaction. A negative value indicates a refund or correction.,object,0..1,,,1.1,This field has been replaced by the `transaction.value` field for consistency with the use of value and amount elsewhere in the standard.
 contracts,contracts/implementation/transactions/amount,Value,,object,0..1,,,,
-contracts,contracts/implementation/transactions/amount/amount,Amount,Amount as a number.,number,0..1,,,,
-contracts,contracts/implementation/transactions/amount/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,,
+contracts,contracts/implementation/transactions/amount/amount,Amount,Amount as a number.,number,0..1,,,1.1,
+contracts,contracts/implementation/transactions/amount/currency,Currency,The currency for each amount should always be specified using the uppercase 3-letter currency code from ISO4217.,string,0..1,"Codelist: ADP, AED, AFA, AFN, ALK, ALL, AMD, ANG, AOA, AOK, AON, AOR, ARA, ARP, ARS, ARY, ATS, AUD, AWG, AYM, AZM, AZN, BAD, BAM, BBD, BDT, BEC, BEF, BEL, BGJ, BGK, BGL, BGN, BHD, BIF, BMD, BND, BOB, BOP, BOV, BRB, BRC, BRE, BRL, BRN, BRR, BSD, BTN, BUK, BWP, BYB, BYN, BYR, BZD, CAD, CDF, CHC, CHE, CHF, CHW, CLF, CLP, CNY, COP, COU, CRC, CSD, CSJ, CSK, CUC, CUP, CVE, CYP, CZK, DDM, DEM, DJF, DKK, DOP, DZD, ECS, ECV, EEK, EGP, ERN, ESA, ESB, ESP, ETB, EUR, FIM, FJD, FKP, FRF, GBP, GEK, GEL, GHC, GHP, GHS, GIP, GMD, GNE, GNF, GNS, GQE, GRD, GTQ, GWE, GWP, GYD, HKD, HNL, HRD, HRK, HTG, HUF, IDR, IEP, ILP, ILR, ILS, INR, IQD, IRR, ISJ, ISK, ITL, JMD, JOD, JPY, KES, KGS, KHR, KMF, KPW, KRW, KWD, KYD, KZT, LAJ, LAK, LBP, LKR, LRD, LSL, LSM, LTL, LTT, LUC, LUF, LUL, LVL, LVR, LYD, MAD, MDL, MGA, MGF, MKD, MLF, MMK, MNT, MOP, MRO, MTL, MTP, MUR, MVQ, MVR, MWK, MXN, MXP, MXV, MYR, MZE, MZM, MZN, NAD, NGN, NIC, NIO, NLG, NOK, NPR, NZD, OMR, PAB, PEH, PEI, PEN, PES, PGK, PHP, PKR, PLN, PLZ, PTE, PYG, QAR, RHD, ROK, ROL, RON, RSD, RUB, RUR, RWF, SAR, SBD, SCR, SDD, SDG, SDP, SEK, SGD, SHP, SIT, SKK, SLL, SOS, SRD, SRG, SSP, STD, SUR, SVC, SYP, SZL, THB, TJR, TJS, TMM, TMT, TND, TOP, TPE, TRL, TRY, TTD, TWD, TZS, UAH, UAK, UGS, UGW, UGX, USD, USN, USS, UYI, UYN, UYP, UYU, UZS, VEB, VEF, VNC, VND, VUV, WST, XAF, XAG, XAU, XBA, XBB, XBC, XBD, XCD, XDR, XEU, XFO, XFU, XOF, XPD, XPF, XPT, XRE, XSU, XTS, XUA, XXX, YDD, YER, YUD, YUM, YUN, ZAL, ZAR, ZMK, ZMW, ZRN, ZRZ, ZWC, ZWD, ZWL, ZWN, ZWR",,1.1,
+contracts,contracts/implementation/transactions/providerOrganization,Provider organization,(Deprecated in 1.1. Use transaction.payer instead.) The Organization Identifier for the organization from which the funds in this transaction originate. Expressed following the Organizational Identifier standard - consult the documentation and the codelist.,object,0..1,,,1.1,This field has been replaced by the `transaction.payer` field to resolve ambiguity arising from 'provider' being interpreted as relating to the goods or services procured rather than the flow of funds between the parties.
 contracts,contracts/implementation/transactions/providerOrganization,Identifier,,object,0..1,,,,
-contracts,contracts/implementation/transactions/providerOrganization/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-contracts,contracts/implementation/transactions/providerOrganization/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-contracts,contracts/implementation/transactions/providerOrganization/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-contracts,contracts/implementation/transactions/providerOrganization/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+contracts,contracts/implementation/transactions/providerOrganization/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+contracts,contracts/implementation/transactions/providerOrganization/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+contracts,contracts/implementation/transactions/providerOrganization/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/providerOrganization/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
+contracts,contracts/implementation/transactions/receiverOrganization,Receiver organization,(Deprecated in 1.1. Use transaction.payee instead). The Organization Identifier for the organization which receives the funds in this transaction. Expressed following the Organizational Identifier standard - consult the documentation and the codelist.,object,0..1,,,1.1,This field has been replaced by the `transaction.payee` field to resolve ambiguity arising from 'receiver' being interpreted as relating to the goods or services procured rather than the flow of funds between the parties.
 contracts,contracts/implementation/transactions/receiverOrganization,Identifier,,object,0..1,,,,
-contracts,contracts/implementation/transactions/receiverOrganization/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,,
-contracts,contracts/implementation/transactions/receiverOrganization/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,,
-contracts,contracts/implementation/transactions/receiverOrganization/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,,
-contracts,contracts/implementation/transactions/receiverOrganization/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,,
+contracts,contracts/implementation/transactions/receiverOrganization/scheme,Scheme,Organization identifiers should be drawn from an existing organization identifier list. The scheme field is used to indicate the list or register from which the identifier is drawn. This value should be drawn from the Organization Identifier Scheme codelist.,string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#organization-identifier-scheme,1.1,
+contracts,contracts/implementation/transactions/receiverOrganization/id,ID,The identifier of the organization in the selected scheme.,"string, integer",0..1,,,1.1,
+contracts,contracts/implementation/transactions/receiverOrganization/legalName,Legal Name,The legally registered name of the organization.,string,0..1,,,1.1,
+contracts,contracts/implementation/transactions/receiverOrganization/uri,URI,"A URI to identify the organization, such as those provided by Open Corporates or some other relevant URI provider. This is not for listing the website of the organization: that can be done through the URL field of the Organization contact point.",string,0..1,uri,http://www.opencorporates.com,1.1,
 contracts,contracts/implementation/milestones,Milestones,"As milestones are completed, milestone completions should be documented.",array,0..n,,,,
-contracts,contracts/implementation/milestones,Milestone,,object,,,,,
+,contracts/implementation/milestones,Milestone,,object,,,,,
 contracts,contracts/implementation/milestones/id,ID,"A local identifier for this milestone, unique within this block. This field is used to keep track of multiple revisions of a milestone through the compilation from release to record mechanism.","string, integer",1..1,,,,
 contracts,contracts/implementation/milestones/title,Title,Milestone title,string,0..1,,,,
 contracts,contracts/implementation/milestones/type,Milestone type,"The type of milestone, drawn from an extended milestoneType codelist.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-type,,
@@ -514,7 +566,7 @@ contracts,contracts/implementation/milestones/dateMet,Date met,The date on which
 contracts,contracts/implementation/milestones/dateModified,Date modified,The date the milestone was last reviewed or modified and the status was altered or confirmed to still be correct.,string,0..1,date-time,,,
 contracts,contracts/implementation/milestones/status,Status,"The status that was realized on the date provided in dateModified, drawn from the milestoneStatus codelist.",string,0..1,"Codelist: scheduled, met, notMet, partiallyMet",http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-status,,
 contracts,contracts/implementation/milestones/documents,Documents,List of documents associated with this milestone (Deprecated in 1.1).,array,0..n,,,1.1,"Inclusion of documents at the milestone level is now deprecated. Documentation should be attached in the tender, award, contract or implementation sections, and titles and descriptions used to highlight the related milestone. Publishers who wish to continue to provide documents at the milestone level should explicitly declare this by using the milestone documents extension."
-contracts,contracts/implementation/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,contracts/implementation/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 contracts,contracts/implementation/milestones/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,1.1,
 contracts,contracts/implementation/milestones/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,1.1,
 contracts,contracts/implementation/milestones/documents/title,Title,The document title.,string,0..1,,,1.1,
@@ -525,7 +577,7 @@ contracts,contracts/implementation/milestones/documents/dateModified,Date modifi
 contracts,contracts/implementation/milestones/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,1.1,
 contracts,contracts/implementation/milestones/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",1.1,
 contracts,contracts/implementation/documents,Documents,Documents and reports that are part of the implementation phase e.g. audit and evaluation reports.,array,0..n,,,,
-contracts,contracts/implementation/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,contracts/implementation/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 contracts,contracts/implementation/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,,
 contracts,contracts/implementation/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,,
 contracts,contracts/implementation/documents/title,Title,The document title.,string,0..1,,,,
@@ -536,7 +588,7 @@ contracts,contracts/implementation/documents/dateModified,Date modified,Date tha
 contracts,contracts/implementation/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,,
 contracts,contracts/implementation/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",,
 contracts,contracts/relatedProcesses,Related processes,"If this process is followed by one or more contracting processes, represented under a separate open contracting identifier (ocid) then details of the related process can be provided here. This is commonly used to point to subcontracts, or to renewal and replacement processes for this contract.",array,0..n,,,,
-contracts,contracts/relatedProcesses,Related Process,A reference to a related contracting process: generally one preceding or following on from the current process.,object,,,,,
+,contracts/relatedProcesses,Related Process,A reference to a related contracting process: generally one preceding or following on from the current process.,object,,,,,
 contracts,contracts/relatedProcesses/id,Relationship ID,"A local identifier for this relationship, unique within this array.",string,1..1,,,,
 contracts,contracts/relatedProcesses/relationship,Relationship,Specify the type of relationship using the related process codelist.,array,0..n,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#related-process,,
 contracts,contracts/relatedProcesses/title,Related process title,"The title of the related process, where referencing an open contracting process, this field should match the tender/title field in the related process.",string,0..1,,,,
@@ -544,7 +596,7 @@ contracts,contracts/relatedProcesses/scheme,Scheme,"The identification scheme us
 contracts,contracts/relatedProcesses/identifier,Identifier,"The identifier of the related process. When cross-referencing information also published using OCDS, this should be the Open Contracting ID (ocid).",string,0..1,,,,
 contracts,contracts/relatedProcesses/uri,Related process URI,"A URI pointing to a machine-readable document, release or record package containing the identified related process.",string,0..1,uri,,,
 contracts,contracts/milestones,Contract milestones,A list of milestones associated with the finalization of this contract.,array,0..n,,,,
-contracts,contracts/milestones,Milestone,,object,,,,,
+,contracts/milestones,Milestone,,object,,,,,
 contracts,contracts/milestones/id,ID,"A local identifier for this milestone, unique within this block. This field is used to keep track of multiple revisions of a milestone through the compilation from release to record mechanism.","string, integer",1..1,,,,
 contracts,contracts/milestones/title,Title,Milestone title,string,0..1,,,,
 contracts,contracts/milestones/type,Milestone type,"The type of milestone, drawn from an extended milestoneType codelist.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-type,,
@@ -555,7 +607,7 @@ contracts,contracts/milestones/dateMet,Date met,The date on which the milestone
 contracts,contracts/milestones/dateModified,Date modified,The date the milestone was last reviewed or modified and the status was altered or confirmed to still be correct.,string,0..1,date-time,,,
 contracts,contracts/milestones/status,Status,"The status that was realized on the date provided in dateModified, drawn from the milestoneStatus codelist.",string,0..1,"Codelist: scheduled, met, notMet, partiallyMet",http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#milestone-status,,
 contracts,contracts/milestones/documents,Documents,List of documents associated with this milestone (Deprecated in 1.1).,array,0..n,,,1.1,"Inclusion of documents at the milestone level is now deprecated. Documentation should be attached in the tender, award, contract or implementation sections, and titles and descriptions used to highlight the related milestone. Publishers who wish to continue to provide documents at the milestone level should explicitly declare this by using the milestone documents extension."
-contracts,contracts/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
+,contracts/milestones/documents,Document,"Links to, or descriptions of, external documents can be attached at various locations within the standard. Documents may be supporting information, formal notices, downloadable forms, or any other kind of resource that should be made public as part of full open contracting.",object,,,,,
 contracts,contracts/milestones/documents/id,ID,"A local, unique identifier for this document. This field is used to keep track of multiple revisions of a document through the compilation from release to record mechanism.","string, integer",1..1,,,1.1,
 contracts,contracts/milestones/documents/documentType,Document type,"A classification of the document described taken from the documentType codelist. Values from the provided codelist should be used wherever possible, though extended values can be provided if the codelist does not have a relevant code.",string,0..1,,http://standard.open-contracting.org/{{version}}/{{lang}}/schema/codelists/#document-type,1.1,
 contracts,contracts/milestones/documents/title,Title,The document title.,string,0..1,,,1.1,
@@ -566,7 +618,7 @@ contracts,contracts/milestones/documents/dateModified,Date modified,Date that th
 contracts,contracts/milestones/documents/format,Format,"The format of the document taken from the IANA Media Types codelist, with the addition of one extra value for 'offline/print', used when this document entry is being used to describe the offline publication of a document. Use values from the template column. Links to web pages should be tagged 'text/html'.",string,0..1,,http://www.iana.org/assignments/media-types/,1.1,
 contracts,contracts/milestones/documents/language,Language,"Specifies the language of the linked document using either two-letter ISO639-1, or extended BCP47 language tags. The use of lowercase two-letter codes from ISO639-1 is strongly recommended unless there is a clear user need for distinguishing the language subtype.",string,0..1,,"https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes, http://www.w3.org/International/articles/language-tags/",1.1,
 contracts,contracts/amendments,Amendments,"A contract amendment is a formal change to, or extension of, a contract, and generally involves the publication of a new contract notice/release, or some other documents detailing the change. The rationale and a description of the changes made can be provided here.",array,0..n,,,,
-contracts,contracts/amendments,Amendment,Amendment information,object,,,,,
+,contracts/amendments,Amendment,Amendment information,object,,,,,
 contracts,contracts/amendments/date,Amendment date,The date of this amendment.,string,0..1,date-time,,,
 contracts,contracts/amendments/rationale,Rationale,An explanation for the amendment.,string,0..1,,,,
 contracts,contracts/amendments/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,,
@@ -576,13 +628,14 @@ contracts,contracts/amendments/releaseID,Amending release (identifier),Provide t
 contracts,contracts/amendments/changes,Amended fields,"An array change objects describing the fields changed, and their former values. (Deprecated in 1.1)",array,0..n,,,1.1,"A free-text or semi-structured string describing the changes made in each amendment can be provided in the amendment.description field. To provide structured information on the fields that have changed, publishers should provide releases indicating the state of the contracting process before and after the amendment.  "
 contracts,contracts/amendments/changes/property,Property,"The property name that has been changed relative to the place the amendment is. For example if the contract value has changed, then the property under changes within the contract.amendment would be value.amount. (Deprecated in 1.1)",string,1..1,,,1.1,
 contracts,contracts/amendments/changes/former_value,Former Value,"The previous value of the changed property, in whatever type the property is. (Deprecated in 1.1)","string, number, integer, array, object",0..1,,,1.1,
+contracts,contracts/amendment,Amendment,The use of individual amendment objects has been deprecated. From OCDS 1.1 information should be provided in the amendments array.,object,0..1,,,1.1,The single amendment object has been deprecated in favour of including amendments in an amendments (plural) array.
 contracts,contracts/amendment,Amendment,Amendment information,object,0..1,,,,
-contracts,contracts/amendment/date,Amendment date,The date of this amendment.,string,0..1,date-time,,,
-contracts,contracts/amendment/rationale,Rationale,An explanation for the amendment.,string,0..1,,,,
-contracts,contracts/amendment/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,,
-contracts,contracts/amendment/description,Description,"A free text, or semi-structured, description of the changes made in this amendment.",string,0..1,,,,
-contracts,contracts/amendment/amendsReleaseID,Amended release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **before** the amendment was made.,string,0..1,,,,
-contracts,contracts/amendment/releaseID,Amending release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **after** the amendment was made.,string,0..1,,,,
+contracts,contracts/amendment/date,Amendment date,The date of this amendment.,string,0..1,date-time,,1.1,
+contracts,contracts/amendment/rationale,Rationale,An explanation for the amendment.,string,0..1,,,1.1,
+contracts,contracts/amendment/id,ID,An identifier for this amendment: often the amendment number,string,0..1,,,1.1,
+contracts,contracts/amendment/description,Description,"A free text, or semi-structured, description of the changes made in this amendment.",string,0..1,,,1.1,
+contracts,contracts/amendment/amendsReleaseID,Amended release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **before** the amendment was made.,string,0..1,,,1.1,
+contracts,contracts/amendment/releaseID,Amending release (identifier),Provide the identifier (release.id) of the OCDS release (from this contracting process) that provides the values for this contracting process **after** the amendment was made.,string,0..1,,,1.1,
 contracts,contracts/amendment/changes,Amended fields,"An array change objects describing the fields changed, and their former values. (Deprecated in 1.1)",array,0..n,,,1.1,"A free-text or semi-structured string describing the changes made in each amendment can be provided in the amendment.description field. To provide structured information on the fields that have changed, publishers should provide releases indicating the state of the contracting process before and after the amendment.  "
 contracts,contracts/amendment/changes/property,Property,"The property name that has been changed relative to the place the amendment is. For example if the contract value has changed, then the property under changes within the contract.amendment would be value.amount. (Deprecated in 1.1)",string,1..1,,,1.1,
 contracts,contracts/amendment/changes/former_value,Former Value,"The previous value of the changed property, in whatever type the property is. (Deprecated in 1.1)","string, number, integer, array, object",0..1,,,1.1,