diff --git a/src/main/java/com/knowledgepixels/nanodash/NanodashLink.java b/src/main/java/com/knowledgepixels/nanodash/NanodashLink.java
index cf12ed70..3aa0f571 100644
--- a/src/main/java/com/knowledgepixels/nanodash/NanodashLink.java
+++ b/src/main/java/com/knowledgepixels/nanodash/NanodashLink.java
@@ -35,20 +35,23 @@ public NanodashLink(String id, String uri, Nanopub np, IRI templateClass, boolea
 				}
 			}
 		}
+
+		final TemplateData td = TemplateData.get();
+
 		if (Template.ASSERTION_TEMPLATE_CLASS.equals(templateClass)) {
-			IRI templateId = Template.getTemplateId(np);
+			IRI templateId = td.getTemplateId(np);
 			if (templateId != null) {
-				templates.add(Template.getTemplate(templateId.stringValue()));
+				templates.add(td.getTemplate(templateId.stringValue()));
 			}
 		} else if (Template.PROVENANCE_TEMPLATE_CLASS.equals(templateClass)) {
-			IRI templateId = Template.getProvenanceTemplateId(np);
+			IRI templateId = td.getProvenanceTemplateId(np);
 			if (templateId != null) {
-				templates.add(Template.getTemplate(templateId.stringValue()));
+				templates.add(td.getTemplate(templateId.stringValue()));
 			}
 		} else if (Template.PUBINFO_TEMPLATE_CLASS.equals(templateClass)) {
-			Set<IRI> templateIds = Template.getPubinfoTemplateIds(np);
+			Set<IRI> templateIds = td.getPubinfoTemplateIds(np);
 			for (IRI templateId : templateIds) {
-				templates.add(Template.getTemplate(templateId.stringValue()));
+				templates.add(td.getTemplate(templateId.stringValue()));
 			}
 		}
 
diff --git a/src/main/java/com/knowledgepixels/nanodash/NanodashPage.java b/src/main/java/com/knowledgepixels/nanodash/NanodashPage.java
index 06217c05..d2bafc7c 100644
--- a/src/main/java/com/knowledgepixels/nanodash/NanodashPage.java
+++ b/src/main/java/com/knowledgepixels/nanodash/NanodashPage.java
@@ -27,7 +27,7 @@ public void run() {
 					System.err.println("Refreshing...");
 					User.refreshUsers();
 					Group.refreshGroups();
-					Template.refreshTemplates();
+					TemplateData.refreshTemplates();
 					System.err.println("Refreshing done.");
 					lastRefresh = System.currentTimeMillis();
 				}
diff --git a/src/main/java/com/knowledgepixels/nanodash/NanopubItem.java b/src/main/java/com/knowledgepixels/nanodash/NanopubItem.java
index 09ae360c..9bd410fa 100644
--- a/src/main/java/com/knowledgepixels/nanodash/NanopubItem.java
+++ b/src/main/java/com/knowledgepixels/nanodash/NanopubItem.java
@@ -185,9 +185,11 @@ public void onClick(AjaxRequestTarget target) {
 		showLessLink.setVisible(!expanded);
 		assertionPart2.add(showLessLink);
 
-		Template assertionTemplate = Template.getTemplate(n.getNanopub());
-		if (tempalteId != null) assertionTemplate = Template.getTemplate(tempalteId);
-		if (assertionTemplate == null) assertionTemplate = Template.getTemplate("http://purl.org/np/RAFu2BNmgHrjOTJ8SKRnKaRp-VP8AOOb7xX88ob0DZRsU");
+		final TemplateData td = TemplateData.get();
+
+		Template assertionTemplate = td.getTemplate(n.getNanopub());
+		if (tempalteId != null) assertionTemplate = td.getTemplate(tempalteId);
+		if (assertionTemplate == null) assertionTemplate = td.getTemplate("http://purl.org/np/RAFu2BNmgHrjOTJ8SKRnKaRp-VP8AOOb7xX88ob0DZRsU");
 		List<StatementItem> assertionStatements = new ArrayList<>();
 		ValueFiller assertionFiller = new ValueFiller(n.getNanopub(), ContextType.ASSERTION, false);
 		TemplateContext context = new TemplateContext(ContextType.ASSERTION, assertionTemplate.getId(), "assertion-statement", n.getNanopub());
@@ -228,8 +230,8 @@ protected void populateItem(Item<Statement> item) {
 		if (hideProvenance) {
 			provenance.setVisible(false);
 		} else {
-			Template provenanceTemplate = Template.getProvenanceTemplate(n.getNanopub());
-			if (provenanceTemplate == null) provenanceTemplate = Template.getTemplate("http://purl.org/np/RA3Jxq5JJjluUNEpiMtxbiIHa7Yt-w8f9FiyexEstD5R4");
+			Template provenanceTemplate = td.getProvenanceTemplate(n.getNanopub());
+			if (provenanceTemplate == null) provenanceTemplate = td.getTemplate("http://purl.org/np/RA3Jxq5JJjluUNEpiMtxbiIHa7Yt-w8f9FiyexEstD5R4");
 			List<StatementItem> provenanceStatements = new ArrayList<>();
 			ValueFiller provenanceFiller = new ValueFiller(n.getNanopub(), ContextType.PROVENANCE, false);
 			TemplateContext prContext = new TemplateContext(ContextType.PROVENANCE, provenanceTemplate.getId(), "provenance-statement", n.getNanopub());
@@ -254,7 +256,7 @@ protected void populateItem(Item<Statement> item) {
 		} else {
 			ValueFiller pubinfoFiller = new ValueFiller(n.getNanopub(), ContextType.PUBINFO, false);
 			List<String> pubinfoTemplateIds = new ArrayList<>();
-			for (IRI iri : Template.getPubinfoTemplateIds(n.getNanopub())) pubinfoTemplateIds.add(iri.stringValue());
+			for (IRI iri : td.getPubinfoTemplateIds(n.getNanopub())) pubinfoTemplateIds.add(iri.stringValue());
 			pubinfoTemplateIds.add("https://w3id.org/np/RAXVsr624oEAJvCt1WZXoUJ90lFYC5LUMoYHgEUOwmrLw"); // user name
 			pubinfoTemplateIds.add("https://w3id.org/np/RARJj78P72NR5edKOnu_f4ePE9NYYuW2m2pM-fEoobMBk"); // nanopub label
 			pubinfoTemplateIds.add("https://w3id.org/np/RA8iXbwvOC7BwVHuvAhFV235j2582SyAYJ2sfov19ZOlg"); // nanopub type
diff --git a/src/main/java/com/knowledgepixels/nanodash/PublishForm.java b/src/main/java/com/knowledgepixels/nanodash/PublishForm.java
index f175afa7..3933d8b3 100644
--- a/src/main/java/com/knowledgepixels/nanodash/PublishForm.java
+++ b/src/main/java/com/knowledgepixels/nanodash/PublishForm.java
@@ -125,8 +125,10 @@ public PublishForm(String id, final PageParameters pageParams, final PublishPage
 			fillMode = null;
 		}
 
+		final TemplateData td = TemplateData.get();
+
 		String templateId = pageParams.get("template").toString();
-		targetNamespace = Template.getTemplate(templateId).getTargetNamespace();
+		targetNamespace = td.getTemplate(templateId).getTargetNamespace();
 		if (!pageParams.get("target-namespace").isNull()) {
 			// TODO: properly integrate this feature:
 			targetNamespace = pageParams.get("target-namespace").toString();
@@ -136,8 +138,8 @@ public PublishForm(String id, final PageParameters pageParams, final PublishPage
 		String prTemplateId = pageParams.get("prtemplate").toString();
 		if (prTemplateId == null) {
 			if (fillNp != null && !fillOnlyAssertion) {
-				if (Template.getProvenanceTemplateId(fillNp) != null) {
-					prTemplateId = Template.getProvenanceTemplateId(fillNp).stringValue();
+				if (td.getProvenanceTemplateId(fillNp) != null) {
+					prTemplateId = td.getProvenanceTemplateId(fillNp).stringValue();
 				} else {
 					prTemplateId = "http://purl.org/np/RAcm8OurwUk15WOgBM9wySo-T3a5h6as4K8YR5MBrrxUc";
 				}
@@ -187,7 +189,7 @@ public PublishForm(String id, final PageParameters pageParams, final PublishPage
 			if (!pubInfoContexts.contains(c)) pubInfoContexts.add(c);
 		}
 		if (fillNp != null && !fillOnlyAssertion) {
-			for (IRI piTemplateId : Template.getPubinfoTemplateIds(fillNp)) {
+			for (IRI piTemplateId : td.getPubinfoTemplateIds(fillNp)) {
 				if (piTemplateId.stringValue().equals(supersedesPubinfoTemplateId)) continue;
 				TemplateContext c = getPubinfoContext(piTemplateId.stringValue());
 				if (!pubInfoContexts.contains(c)) pubInfoContexts.add(c);
@@ -429,11 +431,11 @@ protected void populateItem(ListItem<StatementItem> item) {
 
 		final List<Template> provTemplateOptions;
 		if (pageParams.get("prtemplate-options").isNull()) {
-			provTemplateOptions = Template.getProvenanceTemplates();
+			provTemplateOptions = td.getProvenanceTemplates();
 		} else {
 			provTemplateOptions = new ArrayList<>();
 			for (String tid : pageParams.get("prtemplate-options").toString().split(" ")) {
-				provTemplateOptions.add(Template.getTemplate(tid));
+				provTemplateOptions.add(td.getTemplate(tid));
 			}
 		}
 
@@ -444,7 +446,7 @@ protected void populateItem(ListItem<StatementItem> item) {
 			@Override
 			public String getDisplayValue(String object) {
 				if (object == null || object.isEmpty()) return "";
-				Template t = Template.getTemplate(object);
+				Template t = td.getTemplate(object);
 				if (t != null) return t.getLabel();
 				return "";
 			}
@@ -503,7 +505,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 			@Override
 			public String getDisplayValue(String object) {
 				if (object == null || object.isEmpty()) return "";
-				Template t = Template.getTemplate(object);
+				Template t = td.getTemplate(object);
 				if (t != null) return t.getLabel();
 				return "";
 			}
@@ -522,7 +524,7 @@ public void detach() {
 			public void query(String term, int page, Response<String> response) {
 				if (term == null) term = "";
 				term = term.toLowerCase();
-				for (Template t : Template.getPubInfoTemplates()) {
+				for (Template t : td.getPubInfoTemplates()) {
 					String s = t.getLabel();
 					boolean isAlreadyUsed = false;
 					for (TemplateContext c : pubInfoContexts) {
diff --git a/src/main/java/com/knowledgepixels/nanodash/Template.java b/src/main/java/com/knowledgepixels/nanodash/Template.java
index a6e78624..d5d385f4 100644
--- a/src/main/java/com/knowledgepixels/nanodash/Template.java
+++ b/src/main/java/com/knowledgepixels/nanodash/Template.java
@@ -6,10 +6,8 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
@@ -29,105 +27,10 @@
 import org.nanopub.extra.services.ApiResponse;
 import org.nanopub.extra.services.ApiResponseEntry;
 
-import com.opencsv.exceptions.CsvValidationException;
-
-import net.trustyuri.TrustyUriUtils;
-
 public class Template implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	private static List<Template> assertionTemplates, provenanceTemplates, pubInfoTemplates;
-	private static Map<String,Template> templateMap;
-
-	static void refreshTemplates() {
-		assertionTemplates = new ArrayList<>();
-		provenanceTemplates = new ArrayList<>();
-		pubInfoTemplates = new ArrayList<>();
-		templateMap = new HashMap<>();
-		refreshTemplates(assertionTemplates, ASSERTION_TEMPLATE_CLASS);
-		refreshTemplates(provenanceTemplates, PROVENANCE_TEMPLATE_CLASS);
-		refreshTemplates(pubInfoTemplates, PUBINFO_TEMPLATE_CLASS);
-	}
-
-	private static void refreshTemplates(List<Template> templates, IRI type) {
-		Map<String,String> params = new HashMap<>();
-		params.put("pred", RDF.TYPE.toString());
-		params.put("obj", type.toString());
-		params.put("graphpred", Nanopub.HAS_ASSERTION_URI.toString());
-		ApiResponse templateEntries;
-		try {
-			templateEntries = ApiAccess.getAll("find_signed_nanopubs_with_pattern", params);
-			for (ApiResponseEntry entry : templateEntries.getData()) {
-				if (entry.get("superseded").equals("1") || entry.get("superseded").equals("true")) continue;
-				if (entry.get("retracted").equals("1") || entry.get("retracted").equals("true")) continue;
-				try {
-					Template t = new Template(entry.get("np"));
-					if (!t.isUnlisted()) templates.add(t);
-					templateMap.put(t.getId(), t);
-				} catch (Exception ex) {
-					System.err.println("Exception: " + ex.getMessage());
-				}
-			}
-		} catch (IOException|CsvValidationException ex) {
-			// TODO Better handle this (re-try to get templates)
-			ex.printStackTrace();
-		}
-	}
-
-	public static List<Template> getAssertionTemplates() {
-		if (assertionTemplates == null) refreshTemplates();
-		return assertionTemplates;
-	}
-
-	public static List<Template> getProvenanceTemplates() {
-		if (provenanceTemplates == null) refreshTemplates();
-		return provenanceTemplates;
-	}
-
-	public static List<Template> getPubInfoTemplates() {
-		if (pubInfoTemplates == null) refreshTemplates();
-		return pubInfoTemplates;
-	}
-
-	public static Template getTemplate(String id) {
-		if (assertionTemplates == null) refreshTemplates();
-		Template template = templateMap.get(id);
-		if (template != null) return template;
-		if (TrustyUriUtils.isPotentialTrustyUri(id)) {
-			try {
-				Template t = new Template(id);
-				templateMap.put(id, t);
-				return t;
-			} catch (Exception ex) {
-				System.err.println("Exception: " + ex.getMessage());
-				return null;
-			}
-		}
-		return null;
-	}
-
-	public static Template getTemplate(Nanopub np) {
-		IRI templateId = getTemplateId(np);
-		if (templateId == null) return null;
-		return getTemplate(templateId.stringValue());
-	}
-
-	public static Template getProvenanceTemplate(Nanopub np) {
-		IRI templateId = getProvenanceTemplateId(np);
-		if (templateId == null) return null;
-		return getTemplate(templateId.stringValue());
-	}
-
-	public static Set<Template> getPubinfoTemplates(Nanopub np) {
-		Set<Template> templates = new HashSet<>();
-		for (IRI id : getPubinfoTemplateIds(np)) {
-			templates.add(getTemplate(id.stringValue()));
-		}
-		return templates;
-	}
-
-
 	private static ValueFactory vf = SimpleValueFactory.getInstance();
 	public static final IRI ASSERTION_TEMPLATE_CLASS = vf.createIRI("https://w3id.org/np/o/ntemplate/AssertionTemplate");
 	public static final IRI PROVENANCE_TEMPLATE_CLASS = vf.createIRI("https://w3id.org/np/o/ntemplate/ProvenanceTemplate");
@@ -199,7 +102,7 @@ public static Set<Template> getPubinfoTemplates(Nanopub np) {
 	private String nanopubLabelPattern;
 	private List<IRI> targetNanopubTypes = new ArrayList<>();
 
-	private Template(String templateId) throws RDF4JException, MalformedNanopubException, IOException, MalformedTemplateException {
+	Template(String templateId) throws RDF4JException, MalformedNanopubException, IOException, MalformedTemplateException {
 		nanopub = Utils.getNanopub(templateId);
 		processTemplate(nanopub);
 	}
@@ -611,35 +514,4 @@ public int compare(IRI arg0, IRI arg1) {
 
 	}
 
-	public static IRI getTemplateId(Nanopub nanopub) {
-		for (Statement st : nanopub.getPubinfo()) {
-			if (!st.getSubject().equals(nanopub.getUri())) continue;
-			if (!st.getPredicate().equals(WAS_CREATED_FROM_TEMPLATE_PREDICATE)) continue;
-			if (!(st.getObject() instanceof IRI)) continue;
-			return (IRI) st.getObject();
-		}
-		return null;
-	}
-
-	public static IRI getProvenanceTemplateId(Nanopub nanopub) {
-		for (Statement st : nanopub.getPubinfo()) {
-			if (!st.getSubject().equals(nanopub.getUri())) continue;
-			if (!st.getPredicate().equals(WAS_CREATED_FROM_PROVENANCE_TEMPLATE_PREDICATE)) continue;
-			if (!(st.getObject() instanceof IRI)) continue;
-			return (IRI) st.getObject();
-		}
-		return null;
-	}
-
-	public static Set<IRI> getPubinfoTemplateIds(Nanopub nanopub) {
-		Set<IRI> iriSet = new HashSet<>();
-		for (Statement st : nanopub.getPubinfo()) {
-			if (!st.getSubject().equals(nanopub.getUri())) continue;
-			if (!st.getPredicate().equals(WAS_CREATED_FROM_PUBINFO_TEMPLATE_PREDICATE)) continue;
-			if (!(st.getObject() instanceof IRI)) continue;
-			iriSet.add((IRI) st.getObject());
-		}
-		return iriSet;
-	}
-
 }
diff --git a/src/main/java/com/knowledgepixels/nanodash/TemplateContext.java b/src/main/java/com/knowledgepixels/nanodash/TemplateContext.java
index c247290d..4c34a173 100644
--- a/src/main/java/com/knowledgepixels/nanodash/TemplateContext.java
+++ b/src/main/java/com/knowledgepixels/nanodash/TemplateContext.java
@@ -54,7 +54,7 @@ public TemplateContext(ContextType contextType, String templateId, String compon
 	private TemplateContext(ContextType contextType, String templateId, String componentId, String targetNamespace, Nanopub existingNanopub) {
 		this.contextType = contextType;
 		// TODO: check whether template is of correct type:
-		this.template = Template.getTemplate(templateId);
+		this.template = TemplateData.get().getTemplate(templateId);
 		this.componentId = componentId;
 		if (targetNamespace != null) {
 			this.targetNamespace = targetNamespace;
diff --git a/src/main/java/com/knowledgepixels/nanodash/TemplateData.java b/src/main/java/com/knowledgepixels/nanodash/TemplateData.java
new file mode 100644
index 00000000..0be836fa
--- /dev/null
+++ b/src/main/java/com/knowledgepixels/nanodash/TemplateData.java
@@ -0,0 +1,160 @@
+package com.knowledgepixels.nanodash;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Statement;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.nanopub.Nanopub;
+import org.nanopub.extra.services.ApiAccess;
+import org.nanopub.extra.services.ApiResponse;
+import org.nanopub.extra.services.ApiResponseEntry;
+
+import com.opencsv.exceptions.CsvValidationException;
+
+import net.trustyuri.TrustyUriUtils;
+
+public class TemplateData implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private static TemplateData instance;
+
+	public static synchronized void refreshTemplates() {
+		instance = new TemplateData();
+	}
+
+	public static synchronized void ensureLoaded() {
+		if (instance == null) refreshTemplates();
+	}
+
+	public static TemplateData get() {
+		ensureLoaded();
+		return instance;
+	}
+
+	private List<Template> assertionTemplates, provenanceTemplates, pubInfoTemplates;
+	private Map<String,Template> templateMap;
+
+	public TemplateData() {
+		assertionTemplates = new ArrayList<>();
+		provenanceTemplates = new ArrayList<>();
+		pubInfoTemplates = new ArrayList<>();
+		templateMap = new HashMap<>();
+		refreshTemplates(assertionTemplates, Template.ASSERTION_TEMPLATE_CLASS);
+		refreshTemplates(provenanceTemplates, Template.PROVENANCE_TEMPLATE_CLASS);
+		refreshTemplates(pubInfoTemplates, Template.PUBINFO_TEMPLATE_CLASS);
+	}
+
+	private void refreshTemplates(List<Template> templates, IRI type) {
+		Map<String,String> params = new HashMap<>();
+		params.put("pred", RDF.TYPE.toString());
+		params.put("obj", type.toString());
+		params.put("graphpred", Nanopub.HAS_ASSERTION_URI.toString());
+		ApiResponse templateEntries;
+		try {
+			templateEntries = ApiAccess.getAll("find_signed_nanopubs_with_pattern", params);
+			for (ApiResponseEntry entry : templateEntries.getData()) {
+				if (entry.get("superseded").equals("1") || entry.get("superseded").equals("true")) continue;
+				if (entry.get("retracted").equals("1") || entry.get("retracted").equals("true")) continue;
+				try {
+					Template t = new Template(entry.get("np"));
+					if (!t.isUnlisted()) templates.add(t);
+					templateMap.put(t.getId(), t);
+				} catch (Exception ex) {
+					System.err.println("Exception: " + ex.getMessage());
+				}
+			}
+		} catch (IOException|CsvValidationException ex) {
+			// TODO Better handle this (re-try to get templates)
+			ex.printStackTrace();
+		}
+	}
+
+	public List<Template> getAssertionTemplates() {
+		return assertionTemplates;
+	}
+
+	public List<Template> getProvenanceTemplates() {
+		return provenanceTemplates;
+	}
+
+	public List<Template> getPubInfoTemplates() {
+		return pubInfoTemplates;
+	}
+
+	public Template getTemplate(String id) {
+		Template template = templateMap.get(id);
+		if (template != null) return template;
+		if (TrustyUriUtils.isPotentialTrustyUri(id)) {
+			try {
+				Template t = new Template(id);
+				templateMap.put(id, t);
+				return t;
+			} catch (Exception ex) {
+				System.err.println("Exception: " + ex.getMessage());
+				return null;
+			}
+		}
+		return null;
+	}
+
+	public Template getTemplate(Nanopub np) {
+		IRI templateId = getTemplateId(np);
+		if (templateId == null) return null;
+		return getTemplate(templateId.stringValue());
+	}
+
+	public Template getProvenanceTemplate(Nanopub np) {
+		IRI templateId = getProvenanceTemplateId(np);
+		if (templateId == null) return null;
+		return getTemplate(templateId.stringValue());
+	}
+
+	public Set<Template> getPubinfoTemplates(Nanopub np) {
+		Set<Template> templates = new HashSet<>();
+		for (IRI id : getPubinfoTemplateIds(np)) {
+			templates.add(getTemplate(id.stringValue()));
+		}
+		return templates;
+	}
+
+	public IRI getTemplateId(Nanopub nanopub) {
+		for (Statement st : nanopub.getPubinfo()) {
+			if (!st.getSubject().equals(nanopub.getUri())) continue;
+			if (!st.getPredicate().equals(Template.WAS_CREATED_FROM_TEMPLATE_PREDICATE)) continue;
+			if (!(st.getObject() instanceof IRI)) continue;
+			return (IRI) st.getObject();
+		}
+		return null;
+	}
+
+	public IRI getProvenanceTemplateId(Nanopub nanopub) {
+		for (Statement st : nanopub.getPubinfo()) {
+			if (!st.getSubject().equals(nanopub.getUri())) continue;
+			if (!st.getPredicate().equals(Template.WAS_CREATED_FROM_PROVENANCE_TEMPLATE_PREDICATE)) continue;
+			if (!(st.getObject() instanceof IRI)) continue;
+			return (IRI) st.getObject();
+		}
+		return null;
+	}
+
+	public Set<IRI> getPubinfoTemplateIds(Nanopub nanopub) {
+		Set<IRI> iriSet = new HashSet<>();
+		for (Statement st : nanopub.getPubinfo()) {
+			if (!st.getSubject().equals(nanopub.getUri())) continue;
+			if (!st.getPredicate().equals(Template.WAS_CREATED_FROM_PUBINFO_TEMPLATE_PREDICATE)) continue;
+			if (!(st.getObject() instanceof IRI)) continue;
+			iriSet.add((IRI) st.getObject());
+		}
+		return iriSet;
+	}
+
+}
diff --git a/src/main/java/com/knowledgepixels/nanodash/TemplateList.java b/src/main/java/com/knowledgepixels/nanodash/TemplateList.java
index c82d62a7..6cceadc5 100644
--- a/src/main/java/com/knowledgepixels/nanodash/TemplateList.java
+++ b/src/main/java/com/knowledgepixels/nanodash/TemplateList.java
@@ -28,7 +28,7 @@ public class TemplateList extends Panel {
 	public TemplateList(String id) {
 		super(id);
 
-		ArrayList<Template> templateList = new ArrayList<>(Template.getAssertionTemplates());
+		ArrayList<Template> templateList = new ArrayList<>(TemplateData.get().getAssertionTemplates());
 		Collections.sort(templateList, new Comparator<Template>() {
 			@Override
 			public int compare(Template t1, Template t2) {
diff --git a/src/main/java/com/knowledgepixels/nanodash/action/DeriveAction.java b/src/main/java/com/knowledgepixels/nanodash/action/DeriveAction.java
index 77a1d6cf..c44d2694 100644
--- a/src/main/java/com/knowledgepixels/nanodash/action/DeriveAction.java
+++ b/src/main/java/com/knowledgepixels/nanodash/action/DeriveAction.java
@@ -2,7 +2,7 @@
 
 import org.nanopub.Nanopub;
 
-import com.knowledgepixels.nanodash.Template;
+import com.knowledgepixels.nanodash.TemplateData;
 
 public class DeriveAction extends NanopubAction {
 
@@ -15,8 +15,8 @@ public String getLinkLabel(Nanopub np) {
 
 	@Override
 	public String getTemplateUri(Nanopub np) {
-		if (Template.getTemplateId(np) != null) {
-			return Template.getTemplateId(np).stringValue();
+		if (TemplateData.get().getTemplateId(np) != null) {
+			return TemplateData.get().getTemplateId(np).stringValue();
 		} else {
 			return "http://purl.org/np/RACyK2NjqFgezYLiE8FQu7JI0xY1M1aNQbykeCW8oqXkA";
 		}
diff --git a/src/main/java/com/knowledgepixels/nanodash/action/ImproveAction.java b/src/main/java/com/knowledgepixels/nanodash/action/ImproveAction.java
index 7ca887c5..8217f52f 100644
--- a/src/main/java/com/knowledgepixels/nanodash/action/ImproveAction.java
+++ b/src/main/java/com/knowledgepixels/nanodash/action/ImproveAction.java
@@ -2,7 +2,7 @@
 
 import org.nanopub.Nanopub;
 
-import com.knowledgepixels.nanodash.Template;
+import com.knowledgepixels.nanodash.TemplateData;
 
 public class ImproveAction extends NanopubAction {
 
@@ -15,7 +15,7 @@ public String getLinkLabel(Nanopub np) {
 
 	@Override
 	public String getTemplateUri(Nanopub np) {
-		return Template.getTemplateId(np).stringValue();
+		return TemplateData.get().getTemplateId(np).stringValue();
 	}
 
 	@Override
@@ -35,7 +35,7 @@ public boolean isApplicableToOthersNanopubs() {
 
 	@Override
 	public boolean isApplicableTo(Nanopub np) {
-		return Template.getTemplateId(np) != null;
+		return TemplateData.get().getTemplateId(np) != null;
 	}
 
 }
diff --git a/src/main/java/com/knowledgepixels/nanodash/action/UpdateAction.java b/src/main/java/com/knowledgepixels/nanodash/action/UpdateAction.java
index 6e1f19e4..e2d7f4cb 100644
--- a/src/main/java/com/knowledgepixels/nanodash/action/UpdateAction.java
+++ b/src/main/java/com/knowledgepixels/nanodash/action/UpdateAction.java
@@ -2,7 +2,7 @@
 
 import org.nanopub.Nanopub;
 
-import com.knowledgepixels.nanodash.Template;
+import com.knowledgepixels.nanodash.TemplateData;
 
 public class UpdateAction extends NanopubAction {
 
@@ -15,8 +15,8 @@ public String getLinkLabel(Nanopub np) {
 
 	@Override
 	public String getTemplateUri(Nanopub np) {
-		if (Template.getTemplateId(np) != null) {
-			return Template.getTemplateId(np).stringValue();
+		if (TemplateData.get().getTemplateId(np) != null) {
+			return TemplateData.get().getTemplateId(np).stringValue();
 		} else {
 			return "http://purl.org/np/RACyK2NjqFgezYLiE8FQu7JI0xY1M1aNQbykeCW8oqXkA";
 		}
diff --git a/src/main/java/com/knowledgepixels/nanodash/connector/base/NanopubPage.java b/src/main/java/com/knowledgepixels/nanodash/connector/base/NanopubPage.java
index 632d70c2..16e153ae 100644
--- a/src/main/java/com/knowledgepixels/nanodash/connector/base/NanopubPage.java
+++ b/src/main/java/com/knowledgepixels/nanodash/connector/base/NanopubPage.java
@@ -26,6 +26,7 @@
 import com.knowledgepixels.nanodash.NanopubItem;
 import com.knowledgepixels.nanodash.PublishPage;
 import com.knowledgepixels.nanodash.Template;
+import com.knowledgepixels.nanodash.TemplateData;
 import com.knowledgepixels.nanodash.TitleBar;
 import com.knowledgepixels.nanodash.User;
 import com.knowledgepixels.nanodash.Utils;
@@ -104,7 +105,7 @@ public NanopubPage(final PageParameters parameters) {
 
 		try {
 
-			Template template = Template.getTemplate(np);
+			Template template = TemplateData.get().getTemplate(np);
 			if (template == null) {
 				add(new Label("template-description", ""));
 			} else {
diff --git a/src/main/java/com/knowledgepixels/nanodash/connector/base/TypePage.java b/src/main/java/com/knowledgepixels/nanodash/connector/base/TypePage.java
index 080d645f..bce143c5 100644
--- a/src/main/java/com/knowledgepixels/nanodash/connector/base/TypePage.java
+++ b/src/main/java/com/knowledgepixels/nanodash/connector/base/TypePage.java
@@ -24,6 +24,7 @@
 import com.knowledgepixels.nanodash.NanopubItem;
 import com.knowledgepixels.nanodash.PublishPage;
 import com.knowledgepixels.nanodash.Template;
+import com.knowledgepixels.nanodash.TemplateData;
 import com.knowledgepixels.nanodash.TitleBar;
 import com.knowledgepixels.nanodash.Utils;
 import com.opencsv.exceptions.CsvValidationException;
@@ -58,98 +59,100 @@ public TypePage(final PageParameters parameters) {
 				"http://purl.org/np/RAYfEAP8KAu9qhBkCtyq_hshOvTAJOcdfIvGhiGwUqB-M ";
 				//"http://purl.org/np/RA-4AE_X28pW3dkmCNNP06QSnsxqMiduN7gX3HxSciX5k"
 
+		final TemplateData td = TemplateData.get();
+
 		if (type.equals("superpattern")) {
 			title = "Fully-formal Advanced Statements (Super-Pattern)";
-			template = Template.getTemplate("http://purl.org/np/RAy3tITXPlULFLXxAxek39GLqLdqKkNM5hIzUOZxxjMmI");
+			template = td.getTemplate("http://purl.org/np/RAy3tITXPlULFLXxAxek39GLqLdqKkNM5hIzUOZxxjMmI");
 			exampleId = "http://purl.org/np/RAu49Eu8w-jwQw6hZ2ZgYOYqmF9HpqxZgItA4oy4N8M-4";
 		} else if (type.equals("linkflowsrel")) {
 			title = "Simple Scientific Relations between Individuals";
-			template = Template.getTemplate("http://purl.org/np/RAsz-9JwiOPQufQ5AGSNepkPG0hkWWYutBDWtsMRgKaaU");
+			template = td.getTemplate("http://purl.org/np/RAsz-9JwiOPQufQ5AGSNepkPG0hkWWYutBDWtsMRgKaaU");
 			exampleId = "http://purl.org/np/RAQjB6Dc9lrIxjnFNCXYa6rfDHo5e1WiPSu33WdCEWTNY";
 		} else if (type.equals("crel")) {
 			title = "Simple Scientific Relations based on Classes";
-			template = Template.getTemplate("http://purl.org/np/RAQ9wpGlnll9o034hWI9tGZw6oTBvcN9azFS7hzdESY0I");
+			template = td.getTemplate("http://purl.org/np/RAQ9wpGlnll9o034hWI9tGZw6oTBvcN9azFS7hzdESY0I");
 			exampleId = "http://purl.org/np/RAkX1V_9VIscbvJ6Nz4BKUdgywO0UWgBQlzJUEvdMYG-M";
 		} else if (type.equals("aida")) {
 			title = "Semi-formal Statements Based on English Sentences (AIDA)";
-			template = Template.getTemplate("http://purl.org/np/RAdc8fxS-WgxHFUtTFWOKYJc1ICkDwBH11_f1sBZeQwBY");
+			template = td.getTemplate("http://purl.org/np/RAdc8fxS-WgxHFUtTFWOKYJc1ICkDwBH11_f1sBZeQwBY");
 			exampleId = "http://purl.org/np/RAa5RbYolIrUNlBoAUY5HUmGr-ci6G1pX6lWiNMkZMcYs";
 		} else if (type.equals("classdef")) {
 			title = "Class Definitions";
-			template = Template.getTemplate("http://purl.org/np/RAcWWF8kSXfwZ77XdC59IyH1MJ24wFp-dDeXkPjKHAXM0");
+			template = td.getTemplate("http://purl.org/np/RAcWWF8kSXfwZ77XdC59IyH1MJ24wFp-dDeXkPjKHAXM0");
 			exampleId = "http://purl.org/np/RAj26TjulpgBHXJGe0OwZZZ-cZCJ9WE7ICug5EW2tGH7s";
 		} else if (type.equals("inddef")) {
 			title = "Definitions of Individuals";
-			template = Template.getTemplate("http://purl.org/np/RAL9L_HSXsRpyC9KcxUGejL3qDiWF6Jeoihh09NYdCR7c");
+			template = td.getTemplate("http://purl.org/np/RAL9L_HSXsRpyC9KcxUGejL3qDiWF6Jeoihh09NYdCR7c");
 			exampleId = "http://purl.org/np/RAJRFjNqKKBlxOhij8XnuqOYfjyjruF2jGZgLO2myu9O0";
 		} else if (type.equals("ml")) {
 			title = "Evaluation results of a Machine Learning experiment";
-			template = Template.getTemplate("http://purl.org/np/RAGEv4a9uT48mgnIlWqAvL-XnupfNYojIUmszJDa50xoc");
+			template = td.getTemplate("http://purl.org/np/RAGEv4a9uT48mgnIlWqAvL-XnupfNYojIUmszJDa50xoc");
 			exampleId = "http://purl.org/np/RAQV0grGVX22NUdKxBijorX0vy06-hdDY3BpScIeQzhx0";
 		} else if (type.equals("biorel")) {
 			title = "Simple Biological Relation";
-			template = Template.getTemplate("http://purl.org/np/RAEbbFIMF_kwp2rY1NqhhKHBiIXXL4_UgTC1hyd6l-cJs");
+			template = td.getTemplate("http://purl.org/np/RAEbbFIMF_kwp2rY1NqhhKHBiIXXL4_UgTC1hyd6l-cJs");
 			exampleId = "http://purl.org/np/RASe3c2pjmN9TvAoxD_CZ-qBVhVMUk9dSMRHOOVxdXbqM";
 		} else if (type.equals("taxontaxon")) {
 			title = "Association between taxa";
-			template = Template.getTemplate("http://purl.org/np/RAh16oLqLJKo8I8R2CebR1n8Dwv95KL_H-azFfGt2FGW0");
+			template = td.getTemplate("http://purl.org/np/RAh16oLqLJKo8I8R2CebR1n8Dwv95KL_H-azFfGt2FGW0");
 			exampleId = "http://purl.org/np/RALX2suiPKea3pm65RjS97EL6k9iY1Jew_mb30hO5Zjv0";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 			prTemplateOptions = biodivPrTemplateOptions;
 		} else if (type.equals("taxonenv")) {
 			title = "Association between taxa and environments";
-			template = Template.getTemplate("http://purl.org/np/RAwy5ZloUugunk3gafYppW6MfZGQXD554XgHfCAFHH08k");
+			template = td.getTemplate("http://purl.org/np/RAwy5ZloUugunk3gafYppW6MfZGQXD554XgHfCAFHH08k");
 			exampleId = "http://purl.org/np/RATlLG_xH-woxWfvHYC-7LyV5F0V6Sq4EbDWS86h6CrUI";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 			prTemplateOptions = biodivPrTemplateOptions;
 		} else if (type.equals("taxongene")) {
 			title = "Association between taxa and genes";
-			template = Template.getTemplate("http://purl.org/np/RAQcn-NHXcqWvEsguTCnFspUqCBBbzQis2KafZf3IDMpk");
+			template = td.getTemplate("http://purl.org/np/RAQcn-NHXcqWvEsguTCnFspUqCBBbzQis2KafZf3IDMpk");
 			exampleId = "http://purl.org/np/RArCW84nAUo14Z3GSoIppZKxoIpdJ0V12_ytDMsDTsVmk";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 			prTemplateOptions = biodivPrTemplateOptions;
 		} else if (type.equals("orgorg")) {
 			title = "Association between organisms";
-			template = Template.getTemplate("http://purl.org/np/RAMUbJ6gvqXzVP5-7VzaSW6CAu15OwJR5FtnC1ENqkZDI");
+			template = td.getTemplate("http://purl.org/np/RAMUbJ6gvqXzVP5-7VzaSW6CAu15OwJR5FtnC1ENqkZDI");
 			exampleId = "http://purl.org/np/RAafGz8UV6Nz4m8wyCLV4eJ_bdNfXKpGie0FH6TQZFa84";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 			prTemplateOptions = biodivPrTemplateOptions;
 		} else if (type.equals("orgenv")) {
 			title = "Association between organisms and environments";
-			template = Template.getTemplate("http://purl.org/np/RA3eSKxteBFrsGXdQhllmJa71Od71rPd4wJ8ik7fIMWsc");
+			template = td.getTemplate("http://purl.org/np/RA3eSKxteBFrsGXdQhllmJa71Od71rPd4wJ8ik7fIMWsc");
 			exampleId = "http://purl.org/np/RAWxvypUU6OabNGlBz9jDGLnftqRXdokzI2oemf9vQRGY";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 		} else if (type.equals("taxonnames")) {
 			title = "Association between taxon names (nomenclature)";
-			template = Template.getTemplate("http://purl.org/np/RAf9CyiP5zzCWN-J0Ts5k7IrZY52CagaIwM-zRSBmhrC8");
+			template = td.getTemplate("http://purl.org/np/RAf9CyiP5zzCWN-J0Ts5k7IrZY52CagaIwM-zRSBmhrC8");
 			exampleId = "http://purl.org/np/RAIz2ACUDvk3OAcXc-OjYSuLglUZu-fsJXrC4UtoAF7k4";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 			prTemplateOptions = biodivPrTemplateOptions;
 		} else if (type.equals("orgns")) {
 			title = "Association between organisms and nucleotide sequences";
-			template = Template.getTemplate("http://purl.org/np/RACPgaoRptG1W-IZpNk6r-MBSMgcdZlaMrAtli9GkmKaE");
+			template = td.getTemplate("http://purl.org/np/RACPgaoRptG1W-IZpNk6r-MBSMgcdZlaMrAtli9GkmKaE");
 			exampleId = "http://purl.org/np/RAyOMh3jJ2PWrgis-My3-QbN9yoBXVBulweANHdvJPhak";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 			prTemplateOptions = biodivPrTemplateOptions;
 		} else if (type.equals("taxonns")) {
 			title = "Association between taxa and nucleotide sequences";
-			template = Template.getTemplate("http://purl.org/np/RA1ooazhkXacK_3jibfpfdwqJWNO0yLoN1nrlpuHHi_uM");
+			template = td.getTemplate("http://purl.org/np/RA1ooazhkXacK_3jibfpfdwqJWNO0yLoN1nrlpuHHi_uM");
 			exampleId = "http://purl.org/np/RA5lyV7V98AAm6BM_s8gv17eRRFZsJqvp2TqCGV6QD3gk";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 		} else if (type.equals("biolinkrel")) {
 			title = "Expressing a biological relation between two entities";
-			template = Template.getTemplate("http://purl.org/np/RAjvwGtEUz07hIGUZ_kHpW8R1TSeUhbWH8NdpC0MIvv_A");
+			template = td.getTemplate("http://purl.org/np/RAjvwGtEUz07hIGUZ_kHpW8R1TSeUhbWH8NdpC0MIvv_A");
 			exampleId = "http://purl.org/np/RAPeBcr6fuTot6fU5bKyspkFD_5RX9tLXcCIs1UkEEUUo";
 			prTemplateId = "http://purl.org/np/RAo6MkgozE1DB-3XwjvEO-sgaN02SmsAIEPbiE8xEdHGU";
 			prTemplateOptions = biodivPrTemplateOptions;
 		} else if (type.equals("eqrel")) {
 			title = "Mapping two equivalent or related resource identifiers";
-			template = Template.getTemplate("http://purl.org/np/RAiBrF-il77MccafOpqR5pZgdlBFOreh9TAeKBga-Gxsk");
+			template = td.getTemplate("http://purl.org/np/RAiBrF-il77MccafOpqR5pZgdlBFOreh9TAeKBga-Gxsk");
 			exampleId = "http://purl.org/np/RAEdHUFvCt1jOsW14rU12X2n42iQS0IshN-j4syY2-IuI";
 		} else if (type.equals("reaction")) {
 			// This is still experimental and not yet used
 			title = "A reaction or comment on a paper or nanopublication";
-			template = Template.getTemplate("http://purl.org/np/RANWGVogb5j_VQ6A4nabA34_-zkZTRYNYtItRJXGf2TVQ");
+			template = td.getTemplate("http://purl.org/np/RANWGVogb5j_VQ6A4nabA34_-zkZTRYNYtItRJXGf2TVQ");
 			exampleId = "http://purl.org/np/RAxjCU5pZDoGox98Hb36mquM9Bc1xv0qz4P19p2avnNPI";
 			prTemplateId = "http://purl.org/np/RANwQa4ICWS5SOjw7gp99nBpXBasapwtZF1fIM3H2gYTM";
 		}