diff --git a/contributors.json b/contributors.json
new file mode 100644
index 000000000..5d27482fc
--- /dev/null
+++ b/contributors.json
@@ -0,0 +1,21 @@
+{
+    "Axel Polleres": "Vienna University of Economics and Business",      
+    "Beatriz Esteves": "Universidad Politécnica de Madrid",      
+    "Bert Bos": "W3C/ERCIM",      
+    "Bud Bruegger": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein",      
+    "Elmar Kiesling": "Vienna University of Technology",      
+    "Eva Schlehahn": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein",      
+    "David Hickey": "Dublin City University",      
+    "Fajar J. Ekaputra": "Vienna University of Technology",      
+    "Georg P. Krog": "Signatu AS",      
+    "Harshvardhan J. Pandit": "ADAPT Centre, Trinity College Dublin",
+    "Javier D. Fernández": "Vienna University of Economics and Business",      
+    "Julian Flake": "University of Koblenz-Landau",      
+    "Mark Lizar": "OpenConsent/Kantara Initiative",      
+    "Paul Ryan": "Uniphar PLC",      
+    "Piero Bonatti": "Università di Napoli Federico II",      
+    "Ramisa Gachpaz Hamed": "Trinity College Dublin",      
+    "Rigo Wenning": "W3C/ERCIM",      
+    "Rob Brennan": "University College Dublin",      
+    "Simon Steyskal": "Siemens"
+}
\ No newline at end of file
diff --git a/documentation-generator/003_generate_respec_html.py b/documentation-generator/003_generate_respec_html.py
index 6fd7526b9..5a2aecf0d 100755
--- a/documentation-generator/003_generate_respec_html.py
+++ b/documentation-generator/003_generate_respec_html.py
@@ -36,6 +36,8 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 TEMPLATE_DATA = {}
 
 G = DataGraph()
@@ -101,6 +103,7 @@ def saved_label(item):
     'prefix_this': prefix_this,
     'subclasses': get_subclasses,
     'saved_label': saved_label,
+    'generate_author_affiliation': generate_author_affiliation,
 }
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')
diff --git a/documentation-generator/003_generate_respec_html_owl.py b/documentation-generator/003_generate_respec_html_owl.py
index 661a79b90..dafd65b79 100755
--- a/documentation-generator/003_generate_respec_html_owl.py
+++ b/documentation-generator/003_generate_respec_html_owl.py
@@ -35,6 +35,8 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 TEMPLATE_DATA = {}
 
 G = DataGraph()
@@ -107,6 +109,7 @@ def saved_label(item):
     'prefix_this': prefix_this,
     'subclasses': get_subclasses,
     'saved_label': saved_label,
+    'generate_author_affiliation': generate_author_affiliation,
 }
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')
diff --git a/documentation-generator/003_generate_respec_html_skos.py b/documentation-generator/003_generate_respec_html_skos.py
index 94d6b4440..7e9af1ba4 100755
--- a/documentation-generator/003_generate_respec_html_skos.py
+++ b/documentation-generator/003_generate_respec_html_skos.py
@@ -35,6 +35,8 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 TEMPLATE_DATA = {}
 
 G = DataGraph()
@@ -100,6 +102,7 @@ def saved_label(item):
     'prefix_this': prefix_this,
     'subclasses': get_subclasses,
     'saved_label': saved_label,
+    'generate_author_affiliation': generate_author_affiliation,
 }
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')
diff --git a/documentation-generator/004_generate_guides.py b/documentation-generator/004_generate_guides.py
index d9d1f4562..1feb0d3e3 100755
--- a/documentation-generator/004_generate_guides.py
+++ b/documentation-generator/004_generate_guides.py
@@ -14,9 +14,13 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 # JINJA2 for templating and generating HTML
 from jinja2 import FileSystemLoader, Environment
-JINJA2_FILTERS = {}
+JINJA2_FILTERS = {
+    'generate_author_affiliation': generate_author_affiliation,
+}
 TEMPLATE_DATA = {}
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')
diff --git a/documentation-generator/006_generate_primer.py b/documentation-generator/006_generate_primer.py
index d963af4ae..53798433f 100755
--- a/documentation-generator/006_generate_primer.py
+++ b/documentation-generator/006_generate_primer.py
@@ -14,9 +14,13 @@
     level=logging.DEBUG, format='%(levelname)s - %(funcName)s :: %(lineno)d - %(message)s')
 DEBUG = logging.debug
 
+from vocab_management import generate_author_affiliation
+
 # JINJA2 for templating and generating HTML
 from jinja2 import FileSystemLoader, Environment
-JINJA2_FILTERS = {}
+JINJA2_FILTERS = {
+    'generate_author_affiliation': generate_author_affiliation,
+}
 TEMPLATE_DATA = {}
 
 template_loader = FileSystemLoader(searchpath='./jinja2_resources')
diff --git a/documentation-generator/jinja2_resources/template_dpv.jinja2 b/documentation-generator/jinja2_resources/template_dpv.jinja2
index a57a58ca5..145726570 100644
--- a/documentation-generator/jinja2_resources/template_dpv.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv.jinja2
@@ -28,95 +28,93 @@
     editors: [
     {
       name: "Harshvardhan J. Pandit",
-      url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      url: "https://harshp.com/",
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -627,5 +625,19 @@
   </table>
 </section>
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_gdpr.jinja2 b/documentation-generator/jinja2_resources/template_dpv_gdpr.jinja2
index dfc53ad5c..9746eca62 100644
--- a/documentation-generator/jinja2_resources/template_dpv_gdpr.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_gdpr.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -278,5 +276,18 @@
 </section>
 {% endif %}
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_gdpr_owl.jinja2 b/documentation-generator/jinja2_resources/template_dpv_gdpr_owl.jinja2
index d2cc5db0e..878e36089 100644
--- a/documentation-generator/jinja2_resources/template_dpv_gdpr_owl.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_gdpr_owl.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -277,5 +275,19 @@
   {% endfor %}
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_gdpr_skos.jinja2 b/documentation-generator/jinja2_resources/template_dpv_gdpr_skos.jinja2
index ed2e6768f..6129e6c79 100644
--- a/documentation-generator/jinja2_resources/template_dpv_gdpr_skos.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_gdpr_skos.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -277,5 +275,19 @@
   {% endfor %}
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_legal.jinja2 b/documentation-generator/jinja2_resources/template_dpv_legal.jinja2
index ac7c8de87..a2081f453 100644
--- a/documentation-generator/jinja2_resources/template_dpv_legal.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_legal.jinja2
@@ -29,18 +29,17 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -559,5 +558,16 @@
 </section>
 {% endif %}
 <section id="conformance" class="noTOC"></section>
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_legal_owl.jinja2 b/documentation-generator/jinja2_resources/template_dpv_legal_owl.jinja2
index b51536c22..f81a9b2b1 100644
--- a/documentation-generator/jinja2_resources/template_dpv_legal_owl.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_legal_owl.jinja2
@@ -29,18 +29,17 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -559,5 +558,16 @@
 </section>
 {% endif %}
 <section id="conformance" class="noTOC"></section>
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_legal_skos.jinja2 b/documentation-generator/jinja2_resources/template_dpv_legal_skos.jinja2
index ac50fca8b..1ba8a02b5 100644
--- a/documentation-generator/jinja2_resources/template_dpv_legal_skos.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_legal_skos.jinja2
@@ -29,18 +29,17 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -560,5 +559,16 @@
 </section>
 {% endif %}
 <section id="conformance" class="noTOC"></section>
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_owl.jinja2 b/documentation-generator/jinja2_resources/template_dpv_owl.jinja2
index f99a65a77..206254536 100644
--- a/documentation-generator/jinja2_resources/template_dpv_owl.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_owl.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -573,5 +571,18 @@
 </section>
 {% endif %}
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_owl_tech.jinja2 b/documentation-generator/jinja2_resources/template_dpv_owl_tech.jinja2
index 74fa58634..14f66e8b8 100644
--- a/documentation-generator/jinja2_resources/template_dpv_owl_tech.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_owl_tech.jinja2
@@ -29,30 +29,29 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -221,5 +220,17 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_pd.jinja2 b/documentation-generator/jinja2_resources/template_dpv_pd.jinja2
index 681b4071f..b2baa7232 100644
--- a/documentation-generator/jinja2_resources/template_dpv_pd.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_pd.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -200,5 +198,19 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_pd_owl.jinja2 b/documentation-generator/jinja2_resources/template_dpv_pd_owl.jinja2
index 2d5e00b1e..9fdd9629b 100644
--- a/documentation-generator/jinja2_resources/template_dpv_pd_owl.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_pd_owl.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -200,5 +198,19 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_pd_skos.jinja2 b/documentation-generator/jinja2_resources/template_dpv_pd_skos.jinja2
index 351af3c05..18f62a833 100644
--- a/documentation-generator/jinja2_resources/template_dpv_pd_skos.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_pd_skos.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -200,5 +198,19 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_skos.jinja2 b/documentation-generator/jinja2_resources/template_dpv_skos.jinja2
index 604fe7579..e5fc57d8b 100644
--- a/documentation-generator/jinja2_resources/template_dpv_skos.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_skos.jinja2
@@ -29,94 +29,92 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     formerEditors: [
     {
       name: "Axel Polleres",
       url: "https://www.polleres.net/",
-      company: "Vienna University of Economics and Business",
-      companyURL: "https://wu.ac.at/"
+      "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Axel Polleres",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Axel Polleres" | generate_author_affiliation }}"
       },
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Bert Bos",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Bert Bos" | generate_author_affiliation }}"
       },
       {
         "name": "Bud Bruegger",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Bud Bruegger" | generate_author_affiliation }}"
       },
       {
         "name": "Elmar Kiesling",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Elmar Kiesling" | generate_author_affiliation }}"
       },
       {
         "name": "Eva Schlehahn",
-        "company": "Unabhängige Landeszentrum für Datenschutz Schleswig-Holstein"
+        "company": "{{ "Eva Schlehahn" | generate_author_affiliation }}"
       },
       {
         "name": "David Hickey",
-        "company": "Dublin City University"
+        "company": "{{ "David Hickey" | generate_author_affiliation }}"
       },
       {
         "name": "Fajar J. Ekaputra",
-        "company": "Vienna University of Technology"
+        "company": "{{ "Fajar J. Ekaputra" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Javier D. Fernández",
-        "company": "Vienna University of Economics and Business"
+        "company": "{{ "Javier D. Fernández" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Mark Lizar",
-        "company": "OpenConsent/Kantara Initiative"
+        "company": "{{ "Mark Lizar" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       },
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": "{{ "Piero Bonatti" | generate_author_affiliation }}"
       },
       {
         "name": "Ramisa Gachpaz Hamed",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Ramisa Gachpaz Hamed" | generate_author_affiliation }}"
       },
       {
         "name": "Rigo Wenning",
-        "company": "W3C/ERCIM"
+        "company": "{{ "Rigo Wenning" | generate_author_affiliation }}"
       },
       {
         "name": "Rob Brennan",
-        "company": "Dublin City University"
+        "company": "{{ "Rob Brennan" | generate_author_affiliation }}"
       },
       {
         "name": "Simon Steyskal",
-        "company": "Siemens"
+        "company": "{{ "Simon Steyskal" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -616,5 +614,18 @@ ex:PurposeXYZ rdfs:subClassOf dpvs:RequestedServiceProvision
 </section>
 {% endif %}
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Piero Bonatti and Luigi Sauro to the DPVCG have been funded by the European Union’s Horizon 2020 research and innovation programme under grant agreement N. 731601 (<a href="https://specialprivacy.ercim.eu/">project SPECIAL</a>) until 2019, and under grant agreement N. 883464 (<a href="https://trapeze-project.eu/">project TRAPEZE</a>) from 2020 until 2023.</p>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_skos_tech.jinja2 b/documentation-generator/jinja2_resources/template_dpv_skos_tech.jinja2
index 597e16084..8386a6f04 100644
--- a/documentation-generator/jinja2_resources/template_dpv_skos_tech.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_skos_tech.jinja2
@@ -29,30 +29,29 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -221,5 +220,18 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_dpv_tech.jinja2 b/documentation-generator/jinja2_resources/template_dpv_tech.jinja2
index f11ab87c0..0e33d67ef 100644
--- a/documentation-generator/jinja2_resources/template_dpv_tech.jinja2
+++ b/documentation-generator/jinja2_resources/template_dpv_tech.jinja2
@@ -29,30 +29,29 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -221,5 +220,18 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Beatriz Esteves have received funding through the <a href="https://protect-network.eu/">PROTECT ITN Project</a> from the European Union’s Horizon 2020 research and innovation programme under the Marie Skłodowska-Curie grant agreement No 813497.</p>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_guides_index.jinja2 b/documentation-generator/jinja2_resources/template_guides_index.jinja2
index 50ace4349..eb651818d 100644
--- a/documentation-generator/jinja2_resources/template_guides_index.jinja2
+++ b/documentation-generator/jinja2_resources/template_guides_index.jinja2
@@ -32,8 +32,7 @@
     editors: [{
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }],
     localBiblio: {%  include 'references.json' %}
   };
@@ -51,5 +50,18 @@
         <h1>[[[DPV-GUIDE-OWL2]]]</h1>
         <p>The [[[DPV-GUIDE-OWL2]]] provides guidance for the use of DPV as an OWL2 ontology, and explains how DPV can be easily encoded in a low-complexity profile of OWL2 called OWL2-PL.</p>
     </section>
+
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_guides_owl2.jinja2 b/documentation-generator/jinja2_resources/template_guides_owl2.jinja2
index 1fa59f4af..f1c340bc4 100644
--- a/documentation-generator/jinja2_resources/template_guides_owl2.jinja2
+++ b/documentation-generator/jinja2_resources/template_guides_owl2.jinja2
@@ -25,11 +25,11 @@
     editors: [
       {
         "name": "Piero Bonatti",
-        "company": "Università di Napoli Federico II"
+        "company": {{ "Piero Bonatti" | generate_author_affiliation }}
       },
       {
         "name": "Luigi Sauro",
-        "company": "Università di Napoli Federico II"
+        "company": {{ "Luigi Sauro" | generate_author_affiliation }}
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -243,5 +243,4 @@ EquivalentTo:
     <p>[3] P.A. Bonatti, J. Langens, L. Sauro: <em>Policy Language – v1</em>. TRAPEZE Report D2.1. Available at: <a href="https://trapeze-project.eu/resources/">https://trapeze-project.eu/resources/</a></p>
 </section>
 </body>
-</body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_primer.jinja2 b/documentation-generator/jinja2_resources/template_primer.jinja2
index 73ab825cd..05fa155ef 100644
--- a/documentation-generator/jinja2_resources/template_primer.jinja2
+++ b/documentation-generator/jinja2_resources/template_primer.jinja2
@@ -28,14 +28,12 @@
     editors: [{
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com/",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }],
     authors: [{
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com/",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }],
     localBiblio: {%  include 'references.json' %}
   };
@@ -1383,6 +1381,18 @@ ex:AcmeEUOrg rdf:type dpv:LegalEntity, dpv:DataProtectionOfficer ;
   </section>
   <section class="appendix" id="issue-summary">
   </section>
-</body>
 
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
+</body>
 </html>
diff --git a/documentation-generator/jinja2_resources/template_rights.jinja2 b/documentation-generator/jinja2_resources/template_rights.jinja2
index 3d141e4fb..1c87a3349 100644
--- a/documentation-generator/jinja2_resources/template_rights.jinja2
+++ b/documentation-generator/jinja2_resources/template_rights.jinja2
@@ -25,14 +25,13 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -100,5 +99,16 @@
     <p>[[[RIGHTS-EU]]]: This vocabulary provides concepts representing the EU Fundamental Rights extending DPV's <code>DataSubjectRight</code>.
   </section>
   
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_rights_eu.jinja2 b/documentation-generator/jinja2_resources/template_rights_eu.jinja2
index 89194f68d..4b0c39f0c 100644
--- a/documentation-generator/jinja2_resources/template_rights_eu.jinja2
+++ b/documentation-generator/jinja2_resources/template_rights_eu.jinja2
@@ -25,14 +25,13 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -116,5 +115,17 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_rights_eu_owl.jinja2 b/documentation-generator/jinja2_resources/template_rights_eu_owl.jinja2
index 51837dfda..491df9d81 100644
--- a/documentation-generator/jinja2_resources/template_rights_eu_owl.jinja2
+++ b/documentation-generator/jinja2_resources/template_rights_eu_owl.jinja2
@@ -25,14 +25,13 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -116,5 +115,17 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_rights_eu_skos.jinja2 b/documentation-generator/jinja2_resources/template_rights_eu_skos.jinja2
index 89194f68d..4b0c39f0c 100644
--- a/documentation-generator/jinja2_resources/template_rights_eu_skos.jinja2
+++ b/documentation-generator/jinja2_resources/template_rights_eu_skos.jinja2
@@ -25,14 +25,13 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -116,5 +115,17 @@
     {% endfor %}</ul>
 </section>
 {% endif %}
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_rights_owl.jinja2 b/documentation-generator/jinja2_resources/template_rights_owl.jinja2
index f965a0077..4bc34cb93 100644
--- a/documentation-generator/jinja2_resources/template_rights_owl.jinja2
+++ b/documentation-generator/jinja2_resources/template_rights_owl.jinja2
@@ -25,14 +25,13 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -99,6 +98,17 @@
     <h2>EU Fundamental Rights</h2>
     <p>[[[RIGHTS-EU-OWL]]]: This vocabulary provides concepts representing the EU Fundamental Rights extending DPV's <code>DataSubjectRight</code>.
   </section>
-  
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_rights_skos.jinja2 b/documentation-generator/jinja2_resources/template_rights_skos.jinja2
index 85e9e09db..2c720ec03 100644
--- a/documentation-generator/jinja2_resources/template_rights_skos.jinja2
+++ b/documentation-generator/jinja2_resources/template_rights_skos.jinja2
@@ -25,14 +25,13 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       }
     ],
     localBiblio: {%  include 'references.json' %}
@@ -99,6 +98,17 @@
     <h2>EU Fundamental Rights</h2>
     <p>[[[RIGHTS-EU-SKOS]]]: This vocabulary provides concepts representing the EU Fundamental Rights extending DPV's <code>DataSubjectRight</code>.
   </section>
-  
+
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_risk.jinja2 b/documentation-generator/jinja2_resources/template_risk.jinja2
index 6e193673b..51c39b674 100644
--- a/documentation-generator/jinja2_resources/template_risk.jinja2
+++ b/documentation-generator/jinja2_resources/template_risk.jinja2
@@ -29,30 +29,29 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       }     
     ],
     localBiblio: {%  include 'references.json' %}
@@ -232,5 +231,16 @@
 </section>
 {% endif %}
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_risk_owl.jinja2 b/documentation-generator/jinja2_resources/template_risk_owl.jinja2
index 2f8f6ff99..a16a57274 100644
--- a/documentation-generator/jinja2_resources/template_risk_owl.jinja2
+++ b/documentation-generator/jinja2_resources/template_risk_owl.jinja2
@@ -29,30 +29,29 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       }     
     ],
     localBiblio: {%  include 'references.json' %}
@@ -232,5 +231,16 @@
 </section>
 {% endif %}
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/jinja2_resources/template_risk_skos.jinja2 b/documentation-generator/jinja2_resources/template_risk_skos.jinja2
index 028f2a7e9..a9b7d2e6a 100644
--- a/documentation-generator/jinja2_resources/template_risk_skos.jinja2
+++ b/documentation-generator/jinja2_resources/template_risk_skos.jinja2
@@ -29,30 +29,29 @@
     {
       name: "Harshvardhan J. Pandit",
       url: "https://harshp.com",
-      company: "Trinity College Dublin",
-      companyURL: "https://tcd.ie/"
+      "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
     }
     ],
     authors: [
       {
         "name": "Beatriz Esteves",
-        "company": "Universidad Politécnica de Madrid"
+        "company": "{{ "Beatriz Esteves" | generate_author_affiliation }}"
       },
       {
         "name": "Georg P. Krog",
-        "company": "Signatu AS"
+        "company": "{{ "Georg P. Krog" | generate_author_affiliation }}"
       },
       {
         "name": "Harshvardhan J. Pandit",
-        "company": "Trinity College Dublin"
+        "company": "{{ "Harshvardhan J. Pandit" | generate_author_affiliation }}"
       },
       {
         "name": "Julian Flake",
-        "company": "University of Koblenz-Landau",
+        "company": "{{ "Julian Flake" | generate_author_affiliation }}"
       },
       {
         "name": "Paul Ryan",
-        "company": "Uniphar PLC"
+        "company": "{{ "Paul Ryan" | generate_author_affiliation }}"
       }     
     ],
     localBiblio: {%  include 'references.json' %}
@@ -232,5 +231,16 @@
 </section>
 {% endif %}
 
+<section id="funding-acknowledgements" class="noTOC">
+  <h2>Funding Acknowledgements</h2>
+
+  <h3>Funding Sponsors</h3>
+  <p>The DPVCG and DPV were initiated as part of the <a href="https://specialprivacy.ercim.eu/">SPECIAL H2020 Project</a>, which received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No. 731601. The SPECIAL project ran over a 3-year period from 2017 to 2019.</p>
+  <p>Harshvardhan J. Pandit was funded by the Irish Research Council  Government of Ireland Postdoctoral Fellowship Grant#GOIPD/2020/790 for working within the DPVCG and contributing to the DPV. The fellowship lasted from 2020 to 2022.</p>
+
+  <h3>Funding Acknowledgements for Contributors</h3>
+  <p>The contributions of Harshvardhan J. Pandit have received funding from the ADAPT SFI Centre for Digital Media Technology is funded by Science Foundation Ireland through the SFI Research Centres Programme and is co-funded under the European Regional Development Fund (ERDF) through Grant#13/RC/2106 (2018 to 2020) and Grant#13/RC/2106_P2 (2021 onwards)</p>
+
+</section>
 </body>
 </html>
\ No newline at end of file
diff --git a/documentation-generator/vocab_management.py b/documentation-generator/vocab_management.py
index b72f534fc..975a7e9a5 100644
--- a/documentation-generator/vocab_management.py
+++ b/documentation-generator/vocab_management.py
@@ -45,4 +45,27 @@
 			namespace = Namespace(iri)
 			globals()[variable] = namespace
 			NAMESPACES[prefix] = namespace
-			DEBUG(f'{variable} namespace with IRI {iri}')
\ No newline at end of file
+			DEBUG(f'{variable} namespace with IRI {iri}')
+
+###################### contributors
+
+'''A Jinja2 filter that takes author names and returns their affiliations'''
+
+import json
+
+with open('../contributors.json', 'r') as fd:
+    contributors = json.load(fd)
+
+
+def generate_author_affiliation(author):
+    '''takes author name, returns affiliation'''
+    if author in contributors:
+        return contributors[author]
+    else:
+        return ''
+
+
+def generate_authors_affiliations(authors):
+    '''takes author name, returns affiliation'''
+    authors = [contributors[author] for author in contributors]
+    return authors
\ No newline at end of file