diff --git a/input/ch.fhir.ig.ch-core.xml b/input/ch.fhir.ig.ch-core.xml
index 8fc1c10..8459b41 100644
--- a/input/ch.fhir.ig.ch-core.xml
+++ b/input/ch.fhir.ig.ch-core.xml
@@ -174,7 +174,7 @@
-
+
@@ -337,6 +337,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -363,6 +381,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -514,6 +550,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -664,6 +719,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -786,6 +859,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -800,12 +891,12 @@
-
+
-
+
diff --git a/input/examples/patient/MaxMuster.xml b/input/examples/patient/MaxMuster.xml
index 626e3f1..f6d8ca7 100644
--- a/input/examples/patient/MaxMuster.xml
+++ b/input/examples/patient/MaxMuster.xml
@@ -28,21 +28,91 @@
+
+
-
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md
index b8f9151..55979f8 100644
--- a/input/pagecontent/index.md
+++ b/input/pagecontent/index.md
@@ -4,7 +4,7 @@ This implementation guide is provided to support the use of FHIR®©
This guide is a working specification. We anticipate that it will be implemented and tested by FHIR system producers whose feedback will help improve its content. With this standard for trial use, we are looking for feedback on whether the following goals have been met:
- The guide provides guidance on essential resources for identifiers, code systems, value sets and naming systems in Switzerland, specifically in relation to the Swiss Electronic Patient Record ([EPR](https://www.patientendossier.ch/en)).
- The guide defines extensions that are necessary for local use in Switzerland.
-- The guide covers the requirements for [eCH-0010 postal address (V7.0)](https://www.ech.ch/de/ech/ech-0010/7.0) and [eCH-0011 personal data (V8.1)](https://www.ech.ch/de/ech/ech-0011/8.1) (including [eCH-0007 municipality (V6.0)](https://www.ech.ch/de/ech/ech-0007/6.0) and [eCH-0021 additional personal data (V7.0)](https://www.ech.ch/de/ech/ech-0021/7.0)).
+- The guide covers the requirements for [eCH-0010 postal address (V7.0)](https://www.ech.ch/de/ech/ech-0010/7.0), [eCH-0046 contact (V5.0)](https://www.ech.ch/de/ech/ech-0046/5.0) and [eCH-0011 personal data (V8.1)](https://www.ech.ch/de/ech/ech-0011/8.1) (including [eCH-0007 municipality (V6.0)](https://www.ech.ch/de/ech/ech-0007/6.0) and [eCH-0021 additional personal data (V7.0)](https://www.ech.ch/de/ech/ech-0021/7.0)).
- The guide incorporates Federal Statistics Office (BFS) variables for medical statistics. See [BFS](https://www.bfs.admin.ch/bfs/de/home/statistiken/kataloge-datenbanken/publikationen.assetdetail.7066232.html) (available in German, French and Italian).
**Note**: This implementation guide is not (yet) a FHIR API specification, this will be a goal for the next iteration.
diff --git a/input/pages/changelog.md b/input/pages/changelog.md
index 60e0c02..0256cf2 100644
--- a/input/pages/changelog.md
+++ b/input/pages/changelog.md
@@ -4,6 +4,7 @@ All significant changes to this FHIR implementation guide will be documented on
#### Added
* [#196](https://github.com/hl7ch/ch-core/issues/196): Data type profile [VEKAIdentifier](StructureDefinition-ch-core-veka-identifier.html) for [Coverage.identifier](StructureDefinition-ch-core-coverage.html) and new also for [Patient.identifier](StructureDefinition-ch-core-patient.html)
+* [#204](https://github.com/hl7ch/ch-core/issues/204): Introduce data type profiles for ContactPoints (email, phone, internet) according eCH-0046 (including extensions and terminology) and add them to the telecom element of Patient, Practitioner, Organization, Location
#### Changed / Updated
* [#206](https://github.com/hl7ch/ch-core/issues/206): Improve acronyms definition
diff --git a/input/resources/codesystem/ech-46-emailcategory.xml b/input/resources/codesystem/ech-46-emailcategory.xml
new file mode 100644
index 0000000..6c64b2b
--- /dev/null
+++ b/input/resources/codesystem/ech-46-emailcategory.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/codesystem/ech-46-internetcategory.xml b/input/resources/codesystem/ech-46-internetcategory.xml
new file mode 100644
index 0000000..8a42faf
--- /dev/null
+++ b/input/resources/codesystem/ech-46-internetcategory.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/codesystem/ech-46-phonecategory.xml b/input/resources/codesystem/ech-46-phonecategory.xml
new file mode 100644
index 0000000..c23d3a6
--- /dev/null
+++ b/input/resources/codesystem/ech-46-phonecategory.xml
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/resources/conceptmap/ech-46-emailcategory-to-fhir.xml b/input/resources/conceptmap/ech-46-emailcategory-to-fhir.xml
new file mode 100644
index 0000000..bc1ea86
--- /dev/null
+++ b/input/resources/conceptmap/ech-46-emailcategory-to-fhir.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/resources/conceptmap/ech-46-internetcategory-to-fhir.xml b/input/resources/conceptmap/ech-46-internetcategory-to-fhir.xml
new file mode 100644
index 0000000..006d18f
--- /dev/null
+++ b/input/resources/conceptmap/ech-46-internetcategory-to-fhir.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/resources/conceptmap/ech-46-phonecategory-to-fhir.xml b/input/resources/conceptmap/ech-46-phonecategory-to-fhir.xml
new file mode 100644
index 0000000..eba21fa
--- /dev/null
+++ b/input/resources/conceptmap/ech-46-phonecategory-to-fhir.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/resources/structuredefinition/ch-core-contactpoint-ech-46-email.xml b/input/resources/structuredefinition/ch-core-contactpoint-ech-46-email.xml
new file mode 100644
index 0000000..03abea7
--- /dev/null
+++ b/input/resources/structuredefinition/ch-core-contactpoint-ech-46-email.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/structuredefinition/ch-core-contactpoint-ech-46-internet.xml b/input/resources/structuredefinition/ch-core-contactpoint-ech-46-internet.xml
new file mode 100644
index 0000000..704ef92
--- /dev/null
+++ b/input/resources/structuredefinition/ch-core-contactpoint-ech-46-internet.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/structuredefinition/ch-core-contactpoint-ech-46-phone.xml b/input/resources/structuredefinition/ch-core-contactpoint-ech-46-phone.xml
new file mode 100644
index 0000000..a74a6c7
--- /dev/null
+++ b/input/resources/structuredefinition/ch-core-contactpoint-ech-46-phone.xml
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/structuredefinition/ch-core-location.xml b/input/resources/structuredefinition/ch-core-location.xml
index 017da7c..d1fe10e 100644
--- a/input/resources/structuredefinition/ch-core-location.xml
+++ b/input/resources/structuredefinition/ch-core-location.xml
@@ -41,9 +41,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/resources/structuredefinition/ch-core-organization.xml b/input/resources/structuredefinition/ch-core-organization.xml
index e77a568..8e50ca2 100644
--- a/input/resources/structuredefinition/ch-core-organization.xml
+++ b/input/resources/structuredefinition/ch-core-organization.xml
@@ -111,9 +111,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/resources/structuredefinition/ch-core-patient.xml b/input/resources/structuredefinition/ch-core-patient.xml
index dd9b438..cdcb01b 100644
--- a/input/resources/structuredefinition/ch-core-patient.xml
+++ b/input/resources/structuredefinition/ch-core-patient.xml
@@ -114,7 +114,7 @@ See also [BFS](https://www.bfs.admin.ch/bfs/de/home/register/personenregister/re
-
+
@@ -225,9 +225,66 @@ See also [BFS](https://www.bfs.admin.ch/bfs/de/home/register/personenregister/re
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -305,7 +362,7 @@ See also [BFS](https://www.bfs.admin.ch/bfs/de/home/register/personenregister/re
-
+
@@ -439,6 +496,6 @@ See also [BFS](https://www.bfs.admin.ch/bfs/de/home/register/personenregister/re
-
+
\ No newline at end of file
diff --git a/input/resources/structuredefinition/ch-core-practitioner.xml b/input/resources/structuredefinition/ch-core-practitioner.xml
index 4c2a2b2..c3aa0d7 100644
--- a/input/resources/structuredefinition/ch-core-practitioner.xml
+++ b/input/resources/structuredefinition/ch-core-practitioner.xml
@@ -105,9 +105,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/input/resources/structuredefinition/ch-ext-ech-46-emailcategory.xml b/input/resources/structuredefinition/ch-ext-ech-46-emailcategory.xml
new file mode 100644
index 0000000..1713cca
--- /dev/null
+++ b/input/resources/structuredefinition/ch-ext-ech-46-emailcategory.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/structuredefinition/ch-ext-ech-46-internetcategory.xml b/input/resources/structuredefinition/ch-ext-ech-46-internetcategory.xml
new file mode 100644
index 0000000..b68dd51
--- /dev/null
+++ b/input/resources/structuredefinition/ch-ext-ech-46-internetcategory.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/structuredefinition/ch-ext-ech-46-phonecategory.xml b/input/resources/structuredefinition/ch-ext-ech-46-phonecategory.xml
new file mode 100644
index 0000000..4d60a50
--- /dev/null
+++ b/input/resources/structuredefinition/ch-ext-ech-46-phonecategory.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/valueset/ech-46-emailcategory.xml b/input/resources/valueset/ech-46-emailcategory.xml
new file mode 100644
index 0000000..c5737f6
--- /dev/null
+++ b/input/resources/valueset/ech-46-emailcategory.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/valueset/ech-46-internetcategory.xml b/input/resources/valueset/ech-46-internetcategory.xml
new file mode 100644
index 0000000..06da9b7
--- /dev/null
+++ b/input/resources/valueset/ech-46-internetcategory.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/input/resources/valueset/ech-46-phonecategory.xml b/input/resources/valueset/ech-46-phonecategory.xml
new file mode 100644
index 0000000..5c19ff2
--- /dev/null
+++ b/input/resources/valueset/ech-46-phonecategory.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file