diff --git a/README.md b/README.md
index 6e5bcc8..a515ed3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Russian and English morphology for Java and [Apache Lucene](http://lucene.apache
 
 ### How to use
 
-Build project, by running `mvn clean package`, this will provide you the latest versions of the artifacts - 1.4, add it to your classpath. You could select which version to use - Russian or English.
+Build project, by running `mvn clean package`, this will provide you the latest versions of the artifacts - 1.5, add it to your classpath. You could select which version to use - Russian or English.
 
 Now you can create a Lucene Analyzer:
 
@@ -39,7 +39,7 @@ You can use the LuceneMorphology as morphology filter in a Solr _schema.xml_ usi
 </fieldType>
 ```
 
-Just add _morphology-1.4.jar_ in your Solr lib-directories
+Just add _morphology-1.5.jar_ in your Solr lib-directories
 
 ### Restrictions
   
diff --git a/dictionary-reader/pom.xml b/dictionary-reader/pom.xml
index 9235458..fb4d65a 100644
--- a/dictionary-reader/pom.xml
+++ b/dictionary-reader/pom.xml
@@ -3,27 +3,27 @@
     <parent>
         <artifactId>morphology</artifactId>
         <groupId>org.apache.lucene.morphology</groupId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.lucene.morphology</groupId>
     <artifactId>dictionary-reader</artifactId>
     <name>dictionary-reader</name>
-    <version>1.4</version>
+    <version>1.5</version>
     <url>http://maven.apache.org</url>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.lucene.morphology</groupId>
             <artifactId>russian</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.apache.lucene.morphology</groupId>
             <artifactId>english</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
     </dependencies>
 
diff --git a/dictionary-reader/src/test/java/org/apache/lucene/morphology/AnalyzersTest.java b/dictionary-reader/src/test/java/org/apache/lucene/morphology/AnalyzersTest.java
index 873ff43..02475ae 100644
--- a/dictionary-reader/src/test/java/org/apache/lucene/morphology/AnalyzersTest.java
+++ b/dictionary-reader/src/test/java/org/apache/lucene/morphology/AnalyzersTest.java
@@ -21,7 +21,6 @@ import org.apache.lucene.analysis.CharArraySet;
 import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter;
-import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
@@ -149,10 +148,9 @@ public class AnalyzersTest extends BaseTokenStreamTestCase {
         @Override
         protected TokenStreamComponents createComponents(String s) {
             StandardTokenizer src = new StandardTokenizer();
-            TokenFilter filter = new StandardFilter(src);
             CharArraySet dontStem = new CharArraySet(1, false);
             dontStem.add("Tests");
-            filter = new SetKeywordMarkerFilter(filter, dontStem);
+            TokenFilter filter = new SetKeywordMarkerFilter(src, dontStem);
             filter = new LowerCaseFilter(filter);
             try {
                 filter = new MorphologyFilter(filter, new EnglishLuceneMorphology());
diff --git a/english/pom.xml b/english/pom.xml
index 37a91f4..480eedb 100644
--- a/english/pom.xml
+++ b/english/pom.xml
@@ -3,20 +3,20 @@
     <parent>
         <artifactId>morphology</artifactId>
         <groupId>org.apache.lucene.morphology</groupId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.lucene.morphology</groupId>
     <artifactId>english</artifactId>
     <name>english</name>
-    <version>1.4</version>
+    <version>1.5</version>
     <url>http://maven.apache.org</url>
     <dependencies>
 
         <dependency>
             <groupId>org.apache.lucene.morphology</groupId>
             <artifactId>morph</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
 
     </dependencies>
diff --git a/morph/pom.xml b/morph/pom.xml
index 0309b4b..b3b0576 100644
--- a/morph/pom.xml
+++ b/morph/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>morphology</artifactId>
         <groupId>org.apache.lucene.morphology</groupId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.lucene.morphology</groupId>
     <artifactId>morph</artifactId>
     <name>morph</name>
-    <version>1.4</version>
+    <version>1.5</version>
     <url>http://maven.apache.org</url>
 
 </project>
diff --git a/morph/src/main/java/org/apache/lucene/morphology/analyzer/MorphologyAnalyzer.java b/morph/src/main/java/org/apache/lucene/morphology/analyzer/MorphologyAnalyzer.java
index 60c167e..26f2dcb 100644
--- a/morph/src/main/java/org/apache/lucene/morphology/analyzer/MorphologyAnalyzer.java
+++ b/morph/src/main/java/org/apache/lucene/morphology/analyzer/MorphologyAnalyzer.java
@@ -21,7 +21,6 @@ import org.apache.lucene.analysis.LowerCaseFilter;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.payloads.PayloadEncoder;
 import org.apache.lucene.analysis.payloads.PayloadHelper;
-import org.apache.lucene.analysis.standard.StandardFilter;
 import org.apache.lucene.analysis.standard.StandardTokenizer;
 import org.apache.lucene.morphology.LetterDecoderEncoder;
 import org.apache.lucene.morphology.LuceneMorphology;
@@ -29,7 +28,7 @@ import org.apache.lucene.util.BytesRef;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Reader;
+
 
 public class MorphologyAnalyzer extends Analyzer {
     private LuceneMorphology luceneMorph;
@@ -70,17 +69,10 @@ public class MorphologyAnalyzer extends Analyzer {
                 return new BytesRef(bytes, 0, bytes.length);
             }
         };
-        TokenFilter filter = new StandardFilter(src);
-        filter = new LowerCaseFilter(filter);
+
+        TokenFilter filter = new LowerCaseFilter(src);
         filter = new MorphologyFilter(filter, luceneMorph);
 
-        return new TokenStreamComponents(src, filter) {
-            @Override
-            protected void setReader(final Reader reader) {
-                super.setReader(reader);
-            }
-        };
+        return new TokenStreamComponents(r -> src.setReader(r), filter);
     }
-
-
 }
diff --git a/pom.xml b/pom.xml
index 2f4438b..a9be37b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.apache.lucene.morphology</groupId>
     <artifactId>morphology</artifactId>
     <packaging>pom</packaging>
-    <version>1.4</version>
+    <version>1.5</version>
     <name>morphology</name>
     <url>http://maven.apache.org</url>
 
@@ -16,8 +16,8 @@
     </scm>
 
     <properties>
-        <lucene.version>7.2.1</lucene.version>
-        <morphology.version>1.4</morphology.version>
+        <lucene.version>8.0.0</lucene.version>
+        <morphology.version>1.5</morphology.version>
         <junit.version>4.12</junit.version>
     </properties>
 
diff --git a/russian/pom.xml b/russian/pom.xml
index 76b3384..73a4d2d 100644
--- a/russian/pom.xml
+++ b/russian/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>morphology</artifactId>
         <groupId>org.apache.lucene.morphology</groupId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.lucene.morphology</groupId>
     <artifactId>russian</artifactId>
     <name>russian</name>
-    <version>1.4</version>
+    <version>1.5</version>
     <url>http://maven.apache.org</url>
     <dependencies>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.apache.lucene.morphology</groupId>
             <artifactId>morph</artifactId>
-            <version>1.4</version>
+            <version>1.5</version>
         </dependency>
 
         <dependency>
diff --git a/solr-morphology-analysis/pom.xml b/solr-morphology-analysis/pom.xml
index 74a99eb..38b94a6 100644
--- a/solr-morphology-analysis/pom.xml
+++ b/solr-morphology-analysis/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>morphology</artifactId>
         <groupId>org.apache.lucene.morphology</groupId>
-        <version>1.4</version>
+        <version>1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>