diff --git a/pom.xml b/pom.xml
index cdd9a22..560dfe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.entopix</groupId>
+            <groupId>fi.nationallibrary</groupId>
             <artifactId>maui</artifactId>
-            <version>1.3.1-cygri</version>
+            <version>1.4.6</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -51,11 +51,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>3.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jena</groupId>
-            <artifactId>jena-core</artifactId>
-            <version>2.13.0</version>
         </dependency>
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/src/main/java/org/topbraid/mauiserver/VocabularyResource.java b/src/main/java/org/topbraid/mauiserver/VocabularyResource.java
index 7a48bfb..b9c9fa2 100644
--- a/src/main/java/org/topbraid/mauiserver/VocabularyResource.java
+++ b/src/main/java/org/topbraid/mauiserver/VocabularyResource.java
@@ -2,6 +2,7 @@
 
 import javax.servlet.ServletContext;
 
+import org.apache.jena.rdf.model.Model;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.topbraid.mauiserver.framework.Request;
@@ -14,7 +15,6 @@
 
 import com.entopix.maui.vocab.Vocabulary;
 import com.entopix.maui.vocab.VocabularyStore;
-import com.hp.hpl.jena.rdf.model.Model;
 
 public class VocabularyResource extends Resource
 		implements Gettable, Puttable, Deletable {
diff --git a/src/main/java/org/topbraid/mauiserver/framework/Request.java b/src/main/java/org/topbraid/mauiserver/framework/Request.java
index 1efc198..a1b447e 100644
--- a/src/main/java/org/topbraid/mauiserver/framework/Request.java
+++ b/src/main/java/org/topbraid/mauiserver/framework/Request.java
@@ -13,6 +13,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.shared.JenaException;
 import org.topbraid.mauiserver.MauiServerException;
 import org.topbraid.mauiserver.framework.Resource.Deletable;
 import org.topbraid.mauiserver.framework.Resource.Postable;
@@ -26,9 +29,6 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.shared.JenaException;
 
 public class Request {
 	private final HttpServletRequest request;
diff --git a/src/main/java/org/topbraid/mauiserver/framework/Response.java b/src/main/java/org/topbraid/mauiserver/framework/Response.java
index 22b1029..81b7f5b 100644
--- a/src/main/java/org/topbraid/mauiserver/framework/Response.java
+++ b/src/main/java/org/topbraid/mauiserver/framework/Response.java
@@ -4,15 +4,15 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.shared.JenaException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.shared.JenaException;
 
 public abstract class Response {
 	private final static Logger log = LoggerFactory.getLogger(Response.class);
diff --git a/src/main/java/org/topbraid/mauiserver/persistence/TaggerStore.java b/src/main/java/org/topbraid/mauiserver/persistence/TaggerStore.java
index 78f5691..76bdc00 100644
--- a/src/main/java/org/topbraid/mauiserver/persistence/TaggerStore.java
+++ b/src/main/java/org/topbraid/mauiserver/persistence/TaggerStore.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.jena.rdf.model.Model;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.topbraid.mauiserver.MauiServerException;
@@ -17,7 +18,6 @@
 import org.topbraid.mauiserver.tagger.TaggerConfiguration;
 
 import com.entopix.maui.filters.MauiFilter;
-import com.hp.hpl.jena.rdf.model.Model;
 
 public class TaggerStore {
 	private static final Logger log = LoggerFactory.getLogger(TaggerStore.class);
diff --git a/src/main/java/org/topbraid/mauiserver/persistence/VocabularyStore.java b/src/main/java/org/topbraid/mauiserver/persistence/VocabularyStore.java
index 233c88b..ea8a507 100644
--- a/src/main/java/org/topbraid/mauiserver/persistence/VocabularyStore.java
+++ b/src/main/java/org/topbraid/mauiserver/persistence/VocabularyStore.java
@@ -4,9 +4,9 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.util.FileManager;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.shared.JenaException;
+import org.apache.jena.util.FileManager;
 
 public class VocabularyStore extends FileStore<Model> {
 
diff --git a/src/main/java/org/topbraid/mauiserver/tagger/Tagger.java b/src/main/java/org/topbraid/mauiserver/tagger/Tagger.java
index 5bc58f2..2b5e664 100644
--- a/src/main/java/org/topbraid/mauiserver/tagger/Tagger.java
+++ b/src/main/java/org/topbraid/mauiserver/tagger/Tagger.java
@@ -1,5 +1,6 @@
 package org.topbraid.mauiserver.tagger;
 
+import org.apache.jena.rdf.model.Model;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.topbraid.mauiserver.MauiServerException;
@@ -8,7 +9,6 @@
 import com.entopix.maui.filters.MauiFilter;
 import com.entopix.maui.main.MauiWrapper;
 import com.entopix.maui.vocab.Vocabulary;
-import com.hp.hpl.jena.rdf.model.Model;
 
 public class Tagger {
 	private final static Logger log = LoggerFactory.getLogger(Tagger.class);
diff --git a/src/main/java/org/topbraid/mauiserver/tagger/TaggerConfiguration.java b/src/main/java/org/topbraid/mauiserver/tagger/TaggerConfiguration.java
index 29c4936..64a5697 100644
--- a/src/main/java/org/topbraid/mauiserver/tagger/TaggerConfiguration.java
+++ b/src/main/java/org/topbraid/mauiserver/tagger/TaggerConfiguration.java
@@ -6,16 +6,20 @@
 import org.topbraid.mauiserver.MauiServer;
 import org.topbraid.mauiserver.MauiServerException;
 
+import com.entopix.maui.stemmers.CachingFinnishStemmer;
 import com.entopix.maui.stemmers.FrenchStemmer;
 import com.entopix.maui.stemmers.GermanStemmer;
 import com.entopix.maui.stemmers.PorterStemmer;
 import com.entopix.maui.stemmers.SpanishStemmer;
 import com.entopix.maui.stemmers.Stemmer;
+import com.entopix.maui.stemmers.SwedishStemmer;
 import com.entopix.maui.stopwords.Stopwords;
 import com.entopix.maui.stopwords.StopwordsEnglish;
+import com.entopix.maui.stopwords.StopwordsFinnish;
 import com.entopix.maui.stopwords.StopwordsFrench;
 import com.entopix.maui.stopwords.StopwordsGerman;
 import com.entopix.maui.stopwords.StopwordsSpanish;
+import com.entopix.maui.stopwords.StopwordsSwedish;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -48,6 +52,8 @@ public class TaggerConfiguration {
 		put("fr", FrenchStemmer.class);
 		put("de", GermanStemmer.class);
 		put("es", SpanishStemmer.class);
+		put("fi", CachingFinnishStemmer.class);
+		put("sv", SwedishStemmer.class);
 	}};
 	
 	@SuppressWarnings("serial")
@@ -56,6 +62,8 @@ public class TaggerConfiguration {
 		put("fr", StopwordsFrench.class);
 		put("de", StopwordsGerman.class);
 		put("es", StopwordsSpanish.class);
+		put("fi", StopwordsFinnish.class);
+		put("sv", StopwordsSwedish.class);
 	}};
 	
 	public TaggerConfiguration(String id) {