diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java
index ec5e3f83c5f..35ce4b1ee71 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java
@@ -61,6 +61,6 @@ public class JetAnnotationEntryElementType extends JetStubElementType<KotlinAnno
 
     @Override
     public void indexStub(@NotNull KotlinAnnotationEntryStub stub, @NotNull IndexSink sink) {
-        StubIndexServiceFactory.getInstance().indexAnnotation(stub, sink);
+        StubIndexService.getInstance().indexAnnotation(stub, sink);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java
index c59c1311ef2..afcad2b9856 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java
@@ -103,7 +103,7 @@ public class JetClassElementType extends JetStubElementType<KotlinClassStub, Jet
 
     @Override
     public void indexStub(@NotNull KotlinClassStub stub, @NotNull IndexSink sink) {
-        StubIndexServiceFactory.getInstance().indexClass(stub, sink);
+        StubIndexService.getInstance().indexClass(stub, sink);
     }
 
     public static JetClassElementType getStubType(boolean isEnumEntry) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
index dccee234d2f..f655d9029a4 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
@@ -94,6 +94,6 @@ public class JetFileElementType extends IStubFileElementType<KotlinFileStub> {
 
     @Override
     public void indexStub(@NotNull KotlinFileStub stub, @NotNull IndexSink sink) {
-        StubIndexServiceFactory.getInstance().indexFile(stub, sink);
+        StubIndexService.getInstance().indexFile(stub, sink);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileStubBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileStubBuilder.java
index 37f75efbf5d..8e711d288b9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileStubBuilder.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileStubBuilder.java
@@ -31,7 +31,6 @@ public class JetFileStubBuilder extends DefaultStubBuilder {
             return super.createStubForFile(file);
         }
 
-        JetFile jetFile = (JetFile) file;
-        return new KotlinFileStubImpl(jetFile, jetFile.getPackageFqNameByTree().asString(), jetFile.isScriptByTree());
+        return StubIndexService.getInstance().createFileStub((JetFile) file);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java
index c7fc4cb2149..4a3c17a6af9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java
@@ -83,6 +83,6 @@ public class JetFunctionElementType extends JetStubElementType<KotlinFunctionStu
 
     @Override
     public void indexStub(@NotNull KotlinFunctionStub stub, @NotNull IndexSink sink) {
-        StubIndexServiceFactory.getInstance().indexFunction(stub, sink);
+        StubIndexService.getInstance().indexFunction(stub, sink);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java
index d5e903e82e1..b0a9ba17607 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java
@@ -90,6 +90,6 @@ public class JetObjectElementType extends JetStubElementType<KotlinObjectStub, J
 
     @Override
     public void indexStub(@NotNull KotlinObjectStub stub, @NotNull IndexSink sink) {
-        StubIndexServiceFactory.getInstance().indexObject(stub, sink);
+        StubIndexService.getInstance().indexObject(stub, sink);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java
index 6dc59703fea..c9da7c4176a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java
@@ -89,6 +89,6 @@ public class JetPropertyElementType extends JetStubElementType<KotlinPropertyStu
 
     @Override
     public void indexStub(@NotNull KotlinPropertyStub stub, @NotNull IndexSink sink) {
-        StubIndexServiceFactory.getInstance().indexProperty(stub, sink);
+        StubIndexService.getInstance().indexProperty(stub, sink);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.java
deleted file mode 100644
index 0695313c1e0..00000000000
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.psi.stubs.elements;
-
-import com.intellij.psi.stubs.IndexSink;
-import org.jetbrains.kotlin.psi.stubs.*;
-
-public interface StubIndexService {
-
-    /**
-     * Default implementation with no indexing.
-     */
-    StubIndexService NO_INDEX_SERVICE = new StubIndexService() {
-        @Override
-        public void indexFile(KotlinFileStub stub, IndexSink sink) {
-        }
-
-        @Override
-        public void indexClass(KotlinClassStub stub, IndexSink sink) {
-        }
-
-        @Override
-        public void indexFunction(KotlinFunctionStub stub, IndexSink sink) {
-        }
-
-        @Override
-        public void indexObject(KotlinObjectStub stub, IndexSink sink) {
-        }
-
-        @Override
-        public void indexProperty(KotlinPropertyStub stub, IndexSink sink) {
-        }
-
-        @Override
-        public void indexAnnotation(KotlinAnnotationEntryStub stub, IndexSink sink) {
-        }
-    };
-
-    void indexFile(KotlinFileStub stub, IndexSink sink);
-    void indexClass(KotlinClassStub stub, IndexSink sink);
-    void indexFunction(KotlinFunctionStub stub, IndexSink sink);
-    void indexObject(KotlinObjectStub stub, IndexSink sink);
-    void indexProperty(KotlinPropertyStub stub, IndexSink sink);
-    void indexAnnotation(KotlinAnnotationEntryStub stub, IndexSink sink);
-}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.kt
new file mode 100644
index 00000000000..0a78e4f8362
--- /dev/null
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexService.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.psi.stubs.elements
+
+import com.intellij.openapi.components.ServiceManager
+import com.intellij.psi.stubs.IndexSink
+import org.jetbrains.kotlin.psi.JetFile
+import org.jetbrains.kotlin.psi.stubs.*
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl
+
+public open class StubIndexService protected constructor() {
+    public open fun indexFile(stub: KotlinFileStub, sink: IndexSink) {
+    }
+
+    public open fun indexClass(stub: KotlinClassStub, sink: IndexSink) {
+    }
+
+    public open fun indexFunction(stub: KotlinFunctionStub, sink: IndexSink) {
+    }
+
+    public open fun indexObject(stub: KotlinObjectStub, sink: IndexSink) {
+    }
+
+    public open fun indexProperty(stub: KotlinPropertyStub, sink: IndexSink) {
+    }
+
+    public open fun indexAnnotation(stub: KotlinAnnotationEntryStub, sink: IndexSink) {
+    }
+
+    public open fun createFileStub(file: JetFile): KotlinFileStub {
+        return KotlinFileStubImpl(file, file.packageFqNameByTree.asString(), file.isScriptByTree)
+    }
+
+    companion object {
+        @jvmStatic
+        public fun getInstance(): StubIndexService {
+            return ServiceManager.getService(StubIndexService::class.java) ?: NO_INDEX
+        }
+
+        private val NO_INDEX = StubIndexService()
+    }
+}
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexServiceFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexServiceFactory.java
deleted file mode 100644
index c6676571055..00000000000
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/StubIndexServiceFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.psi.stubs.elements;
-
-import com.intellij.openapi.components.ServiceManager;
-
-final class StubIndexServiceFactory {
-
-    private StubIndexServiceFactory() {
-    }
-
-    public static StubIndexService getInstance() {
-        // If executed in plugin service will be registered
-        StubIndexService registeredService = ServiceManager.getService(StubIndexService.class);
-        return registeredService != null ? registeredService : StubIndexService.NO_INDEX_SERVICE;
-    }
-}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.java
index 581f3f58a5c..5cebe933c76 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.util.UtilPackage;
 
 import java.util.List;
 
-public class StubIndexServiceImpl implements StubIndexService {
+public class StubIndexServiceImpl extends StubIndexService {
 
     @Override
     public void indexFile(KotlinFileStub stub, IndexSink sink) {