diff --git a/example/.gitignore b/example/.gitignore
index 8a3a76b6a50af2d4f4000e895a6e92372ac230de..7e517f5c9c63fb71fa0a525091443ae8a926020a 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -1,7 +1,13 @@
 example.aux
+example.bbl
+example.bcf
+example.blg
+example.glg
 example.glo
+example.gls
 example.ist
 example.log
 example.out
 example.pdf
+example.run.xml
 meta.tex
diff --git a/texmf/bibtex/bib/astron.bib b/texmf/bibtex/bib/astron.bib
index 16c713b67b16cdb7e0d65f4eb19e1377df8cbe7b..e1dc85c26257a6af577349f8cdc51c9a42a30b5d 100644
--- a/texmf/bibtex/bib/astron.bib
+++ b/texmf/bibtex/bib/astron.bib
@@ -5,7 +5,7 @@
     title = "Vision on {LOFAR} and the {SDC}",
     institution = "ASTRON",
     year = 2020,
-    month = "jan",
+    month = 1,
     day = 30,
     version = 1,
     url = {https://edu.nl/afu73},
diff --git a/texmf/bibtex/bib/ivoa.bib b/texmf/bibtex/bib/ivoa.bib
new file mode 100644
index 0000000000000000000000000000000000000000..e9ce6c61cd1e419da6997bffbfe05b155aeea9ce
--- /dev/null
+++ b/texmf/bibtex/bib/ivoa.bib
@@ -0,0 +1,13 @@
+% IVOA documents
+
+@Misc{2017ivoa.spec.0509L,
+    author = {{Louys}, Mireille and {Tody}, Doug and {Dowler}, Patrick and {Durand}, Daniel and {Michel}, Laurent and {Bonnarel}, Francos and {Micol}, Alberto and {IVOA DataModel Working Group}},
+    title = "{Observation Data Model Core Components, its Implementation in the Table Access Protocol Version 1.1}",
+    howpublished = {IVOA Recommendation},
+    year = 2017,
+    month = may,
+    day  = 9,
+    doi = {10.5479/ADS/bib/2017ivoa.spec.0509L},
+    adsurl = {https://ui.adsabs.harvard.edu/abs/2017ivoa.spec.0509L},
+    adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}
diff --git a/texmf/bibtex/bib/lofar.bib b/texmf/bibtex/bib/lofar.bib
index c3c5531f647095c4db37b06a4fbbc291843d31a3..66a2b1ee1ca8be59ab67f29c045d55949f3b2706 100644
--- a/texmf/bibtex/bib/lofar.bib
+++ b/texmf/bibtex/bib/lofar.bib
@@ -5,8 +5,8 @@
     title = "Architectural Design of {SDC} and {LOFAR2.0} Interaction",
     institution = "ASTRON",
     year = 2020,
-    month = sep,
+    month = 9,
     day = 16,
-    version = 1.2,
+    version = "1.2",
     url = {https://edu.nl/xfa7k},
 }
diff --git a/texmf/bibtex/bib/sdc.bib b/texmf/bibtex/bib/sdc.bib
index a778aa0fc29597af3f49e62f75d79b893f4449b9..8b7d9003585788b02cd03a47e9a1d2829b9d8ec1 100644
--- a/texmf/bibtex/bib/sdc.bib
+++ b/texmf/bibtex/bib/sdc.bib
@@ -5,8 +5,9 @@
     title = "{SDC} Software Maintenance in an Agile Environment",
     institution = "ASTRON",
     year = 2020,
-    version = draft,
-    url = {https://git.astron.nl/swinbank/doc-sdc-001}
+    pubstate = "inpreparation",
+    eprinttype = "sdc-handle",
+    eprint = "SDC-001"
 }
 
 @TechReport{SDC-002,
@@ -14,8 +15,9 @@
     title = "{ASTRON Science Data Centre} Program Management Plan",
     institution = "ASTRON",
     year = 2020,
-    version = draft,
-    url = {https://git.astron.nl/swinbank/doc-sdc-002}
+    pubstate = "inpreparation",
+    eprinttype = "sdc-handle",
+    eprint = "SDC-002"
 }
 
 @TechReport{SDC-003,
@@ -23,8 +25,9 @@
     title = "{FuSE} Project Management Plan",
     institution = "ASTRON",
     year = 2020,
-    version = draft,
-    url = {https://git.astron.nl/swinbank/doc-sdc-003}
+    pubstate = "inpreparation",
+    eprinttype = "sdc-handle",
+    eprint = "SDC-003"
 }
 
 @TechReport{SDC-004,
@@ -32,6 +35,7 @@
     title = "{ASTRON Science Data Centre} Vision",
     institution = "ASTRON",
     year = 2020,
-    version = draft,
-    url = {https://git.astron.nl/swinbank/doc-sdc-004}
+    pubstate = "inpreparation",
+    eprinttype = "sdc-handle",
+    eprint = "SDC-003"
 }
diff --git a/texmf/bibtex/bib/sdco.bib b/texmf/bibtex/bib/sdco.bib
new file mode 100644
index 0000000000000000000000000000000000000000..334e9d9583748f2d532dc5de9cd9706640b2c62b
--- /dev/null
+++ b/texmf/bibtex/bib/sdco.bib
@@ -0,0 +1,33 @@
+% Documents originating from SDC Operations
+
+@Misc{2020-SDCO-Req-User-Data-Processing,
+    author = "{SDCO} Team",
+    title = "SDC User Data Processing Service Requirements",
+    institution = "ASTRON",
+    year = 2020,
+    url = {https://support.astron.nl/confluence/display/ROSDC/SDC+User+Data+Processing+Service+Requirements}
+}
+
+@Misc{2020-SDCO-Req-ADEX,
+    author = "{SDCO} Team",
+    title = "{ADEX} Requirements",
+    institution = "ASTRON",
+    year = 2020,
+    url = {https://support.astron.nl/confluence/display/ROSDC/ADEX+requirements}
+}
+
+@Misc{2020-SDCO-Req-LOFAR-Staging-Service,
+    author = "{SDCO} Team",
+    title = "{LOFAR} Staging Service Requirements",
+    institution = "ASTRON",
+    year = 2020,
+    url = {https://support.astron.nl/confluence/display/ROSDC/LOFAR+Staging+Service}
+}
+
+@Misc{2020-SDCO-Req-Federated-AAI,
+    author = "{SDCO} Team",
+    title = "Federated {AAI} Requirements",
+    institution = "ASTRON",
+    year = 2020,
+    url = {https://support.astron.nl/confluence/display/ROSDC/Federated+AAI}
+}
diff --git a/texmf/tex/latex/astron/astron-abbreviations.tex b/texmf/tex/latex/astron/astron-abbreviations.tex
index a7c656a7985cc71305e2470f04b5832a2e6a8bdf..2618f902563c41f24160d897b03a8a5e25db7850 100644
--- a/texmf/tex/latex/astron/astron-abbreviations.tex
+++ b/texmf/tex/latex/astron/astron-abbreviations.tex
@@ -7,6 +7,7 @@
 \newacronym{HBA}{HBA}{High-Band Antenna}
 \newacronym{ICA}{ICA}{Internal Cooperation Agreement}
 \newacronym{ILT}{ILT}{International LOFAR Telescope}
+\newacronym{IVOA}{IVOA}{International Virtual Observatory Alliance}
 \newacronym{IS}{I\&S}{Innovation and Systems}
 \newacronym{LBA}{LBA}{Low-Band Antenna}
 \newacronym{LTA}{LTA}{Long Term Archive}
diff --git a/texmf/tex/latex/astron/astron.cls b/texmf/tex/latex/astron/astron.cls
index bb91c63eb4dabf2b21fc8343d13eb126ee762e1d..257925ba8f95dac857785b9447ab79a20cb3387c 100644
--- a/texmf/tex/latex/astron/astron.cls
+++ b/texmf/tex/latex/astron/astron.cls
@@ -27,10 +27,18 @@
 \RequirePackage{parskip}
 \RequirePackage{tabularx}
 
+% Link to document repositories for appropriate e-prints in the bibliography
+\DeclareFieldFormat{eprint:sdc-handle}{%
+  Document handle\addcolon\space
+    \href{https://git.astron.nl/swinbank/doc-#1}{#1}%
+}
+
 % Standard bibliography files included in this package
 \addbibresource{astron.bib}
+\addbibresource{ivoa.bib}
 \addbibresource{lofar.bib}
 \addbibresource{sdc.bib}
+\addbibresource{sdco.bib}
 
 % No need for a fancy font for the URL
 \urlstyle{same}