diff --git a/README.md b/README.md
index 41f9ba5..1519a51 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,34 @@
-# Reporting BIS
+# Reporting Specifications
-The repository uses the new specification build tools for generating the artifacts and the static
-site of the BIS
+The repository uses the new specification build tools for generating the artifacts and the static site of the specifications.
+
+The created site is available at:
+* Prod: https://docs.peppol.eu/edelivery/specs/reporting/
+* Test: https://test-docs.peppol.eu/edelivery/specs/reporting/
+
+Note: the build tools (PDK) is currently not publicly available.
+
+## Using the script
-## Using the scripts
Using the either the [powershell](docker-pdk.ps1), [batch script](docker-pdk.cmd) in Windows or
the [bash](docker-pdk.sh) script on Linux and MacOS we can initiate nay of the possible build tasks
## Starting a build
+
The build using the following command:
`./docker-pdk`
## cleaning up
+
The build using the following command:
`./docker-pdk clean`
## Starting up the server to serve the built pages
+
To start the local html server run the following command:
`./docker-pdk-serve`
## Stopping the server
+
To stop the local html server run the following command:
`docker stop pdk-serve`
diff --git a/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix1.xml b/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix1.xml
index 10a9666..59e1095 100644
--- a/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix1.xml
+++ b/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix1.xml
@@ -46,77 +46,187 @@
- DE
- 9
- 4
- 9
+ AT
+ 3
+ 2
+ 3
- NO
- 9
- 4
- 9
+ BE
+ 3
+ 1
+ 3
+
+
+ CY
+ 3
+ 1
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ AT
+ 0
+ 1
+ 1
-
urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
- DE
+ BE
0
+ 1
+ 1
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ AT
+ 3
2
- 2
+ 3
urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
- DE
- 9
- 4
- 9
+ BE
+ 3
+ 1
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ CY
+ 3
+ 1
+ 3
urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
- NO
- 9
+ AT
+ 3
0
- 9
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ BE
+ 3
+ 0
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ CY
+ 3
+ 0
+ 3
urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1
- NO
+ AT
0
- 4
- 4
+ 2
+ 2
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1
+ BE
+ 0
+ 1
+ 1
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1
+ CY
+ 0
+ 1
+ 1
urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
- DE
+ AT
+ 0
+ 1
+ 1
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2::CreditNote##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ BE
0
+ 1
+ 1
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ AT
+ 3
2
- 2
+ 3
urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
- DE
- 9
- 4
- 9
+ BE
+ 3
+ 1
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ CY
+ 3
+ 1
+ 3
urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
urn:fdc:peppol.eu:poacc:bis:ordering:3
- NO
- 9
+ AT
+ 3
0
- 9
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ urn:fdc:peppol.eu:poacc:bis:ordering:3
+ BE
+ 3
+ 0
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ urn:fdc:peppol.eu:poacc:bis:ordering:3
+ CY
+ 3
+ 0
+ 3
urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1
urn:fdc:peppol.eu:poacc:bis:ordering:3
- NO
+ AT
0
- 4
- 4
+ 2
+ 2
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1
+ urn:fdc:peppol.eu:poacc:bis:ordering:3
+ BE
+ 0
+ 1
+ 1
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:OrderResponse-2::OrderResponse##urn:fdc:peppol.eu:poacc:trns:order_response:3::2.1
+ urn:fdc:peppol.eu:poacc:bis:ordering:3
+ CY
+ 0
+ 1
+ 1
diff --git a/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix2.xml b/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix2.xml
index e918ed3..07c7314 100644
--- a/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix2.xml
+++ b/src/eusr/trn-end_user_statistics/example/end-user-statistics-reporting-appendix2.xml
@@ -32,52 +32,87 @@
- DE
- 9
+ AT
+ 3
0
- 9
+ 3
- NO
- 5
+ BE
+ 3
0
- 5
+ 3
+
+
+ CY
+ 3
+ 0
+ 3
urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
- DE
- 9
+ AT
+ 3
0
- 9
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ BE
+ 3
+ 0
+ 3
urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
- NO
+ CY
3
0
3
urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
- NO
- 5
+ AT
+ 2
0
- 5
+ 2
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ BE
+ 2
+ 0
+ 2
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ CY
+ 1
+ 0
+ 1
urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
- DE
- 9
+ AT
+ 3
0
- 9
+ 3
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
+ urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
+ BE
+ 3
+ 0
+ 3
urn:oasis:names:specification:ubl:schema:xsd:Invoice-2::Invoice##urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0::2.1
urn:fdc:peppol.eu:2017:poacc:billing:01:1.0
- NO
+ CY
3
0
3
@@ -85,9 +120,25 @@
urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
urn:fdc:peppol.eu:poacc:bis:ordering:3
- NO
- 5
+ AT
+ 2
0
- 5
+ 2
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ urn:fdc:peppol.eu:poacc:bis:ordering:3
+ BE
+ 2
+ 0
+ 2
+
+
+ urn:oasis:names:specification:ubl:schema:xsd:Order-2::Order##urn:fdc:peppol.eu:poacc:trns:order:3::2.1
+ urn:fdc:peppol.eu:poacc:bis:ordering:3
+ CY
+ 1
+ 0
+ 1