diff --git a/emf/src/main/java/org/nasdanika/html/emf/ActionProviderAdapterFactory.java b/emf/src/main/java/org/nasdanika/html/emf/ActionProviderAdapterFactory.java
index 0a8f8ff6..63675191 100644
--- a/emf/src/main/java/org/nasdanika/html/emf/ActionProviderAdapterFactory.java
+++ b/emf/src/main/java/org/nasdanika/html/emf/ActionProviderAdapterFactory.java
@@ -30,7 +30,7 @@ public ActionProviderAdapterFactory(Context context) {
 			new FunctionAdapterFactory<ActionProvider, Temporal>(
 				NcorePackage.Literals.TEMPORAL, 
 				ActionProvider.class, 
-				this.getClass().getClassLoader(), 
+				Thread.currentThread().getContextClassLoader(), 
 				e -> new TemporalActionBuilder(e, context) {
 					
 					@Override
@@ -44,7 +44,7 @@ protected String getHtmlExtension() {
 				new FunctionAdapterFactory<ActionProvider, Composite>(
 					NcorePackage.Literals.COMPOSITE, 
 					ActionProvider.class, 
-					this.getClass().getClassLoader(), 
+					Thread.currentThread().getContextClassLoader(), 
 					e -> new CompositeActionBuilder<Composite>(e, context) {
 						
 						@Override
diff --git a/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResource.java b/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResource.java
index a819b10b..0ca9c7eb 100644
--- a/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResource.java
+++ b/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResource.java
@@ -157,7 +157,7 @@ protected EObject getByRefId(EObject eObj, URI baseURI, String refId, int pass,
 	}
 	
 	protected ClassLoader getClassLoader(EObject context, URI baseURI, Supplier<ClassLoader> logicalParentClassLoaderSupplier) {
-		return logicalParentClassLoaderSupplier == null ? getClass().getClassLoader() : logicalParentClassLoaderSupplier.get();
+		return logicalParentClassLoaderSupplier == null ? Thread.currentThread().getContextClassLoader() : logicalParentClassLoaderSupplier.get();
 	}	
 
 	protected URI getAppBase() {
diff --git a/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResourceFactory.java b/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResourceFactory.java
index cee3ba33..da26a95b 100644
--- a/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResourceFactory.java
+++ b/model/app/src/main/java/org/nasdanika/html/model/app/util/AppDrawioResourceFactory.java
@@ -73,7 +73,7 @@ protected ProgressMonitor getProgressMonitor() {
 	}
 	
 	protected ClassLoader getClassLoader(EObject context, URI baseURI, Supplier<ClassLoader> logicalParentClassLoaderSupplier) {
-		return logicalParentClassLoaderSupplier == null ? getClass().getClassLoader() : logicalParentClassLoaderSupplier.get();
+		return logicalParentClassLoaderSupplier == null ? Thread.currentThread().getContextClassLoader() : logicalParentClassLoaderSupplier.get();
 	}	
 
 	protected URI getAppBase() {
diff --git a/model/html.gen/src/main/java/org/nasdanika/html/model/html/gen/HtmlAdapterFactory.java b/model/html.gen/src/main/java/org/nasdanika/html/model/html/gen/HtmlAdapterFactory.java
index c10b4ca1..dd597f44 100644
--- a/model/html.gen/src/main/java/org/nasdanika/html/model/html/gen/HtmlAdapterFactory.java
+++ b/model/html.gen/src/main/java/org/nasdanika/html/model/html/gen/HtmlAdapterFactory.java
@@ -39,14 +39,14 @@ public HtmlAdapterFactory() {
 				new FunctionAdapterFactory<SupplierFactory<org.nasdanika.html.Tag>, Script>(
 					HtmlPackage.Literals.SCRIPT, 
 					Util.getSupplierFactoryClass(org.nasdanika.html.Tag.class), 
-					this.getClass().getClassLoader(), 
+					classLoader, 
 					ScriptSupplierFactoryAdapter::new));
 		
 		registerAdapterFactory(
 				new FunctionAdapterFactory<SupplierFactory<InputStream>, org.nasdanika.ncore.List>(
 					NcorePackage.Literals.LIST, 
 					Util.getSupplierFactoryClass(InputStream.class), 
-					this.getClass().getClassLoader(), 
+					classLoader, 
 					ListSupplierFactoryAdapter::new));		
 				
 	}