diff --git a/scala.core/nbproject/project.properties b/scala.core/nbproject/project.properties
--- a/scala.core/nbproject/project.properties
+++ b/scala.core/nbproject/project.properties
@@ -1,4 +1,4 @@
-spec.version.base=0.2.0
+spec.version.base=0.3.0
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.5
diff --git a/scala.core/nbproject/project.xml b/scala.core/nbproject/project.xml
--- a/scala.core/nbproject/project.xml
+++ b/scala.core/nbproject/project.xml
@@ -48,8 +48,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.11</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/scala.core/src/org/netbeans/api/language/util/ast/AstItem.scala b/scala.core/src/org/netbeans/api/language/util/ast/AstItem.scala
--- a/scala.core/src/org/netbeans/api/language/util/ast/AstItem.scala
+++ b/scala.core/src/org/netbeans/api/language/util/ast/AstItem.scala
@@ -41,7 +41,7 @@
 import javax.swing.Icon
 import org.netbeans.api.lexer.{Token, TokenId, TokenHierarchy}
 import org.netbeans.modules.csl.api.{ElementKind, ElementHandle, Modifier, OffsetRange}
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.netbeans.modules.csl.spi.{ParserResult}
 import org.openide.filesystems.{FileObject}
 
diff --git a/scala.core/src/org/netbeans/modules/scala/core/element/JavaElements.scala b/scala.core/src/org/netbeans/modules/scala/core/element/JavaElements.scala
--- a/scala.core/src/org/netbeans/modules/scala/core/element/JavaElements.scala
+++ b/scala.core/src/org/netbeans/modules/scala/core/element/JavaElements.scala
@@ -39,7 +39,7 @@
 package org.netbeans.modules.scala.core.element
 
 import org.netbeans.modules.csl.api.{ElementHandle, ElementKind, Modifier, HtmlFormatter, OffsetRange}
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.netbeans.modules.csl.spi.ParserResult
 import org.openide.filesystems.FileObject
 
diff --git a/scala.core/src/org/netbeans/modules/scala/core/element/ScalaElements.scala b/scala.core/src/org/netbeans/modules/scala/core/element/ScalaElements.scala
--- a/scala.core/src/org/netbeans/modules/scala/core/element/ScalaElements.scala
+++ b/scala.core/src/org/netbeans/modules/scala/core/element/ScalaElements.scala
@@ -46,7 +46,7 @@
 import org.netbeans.api.lexer.TokenHierarchy
 import org.netbeans.editor.BaseDocument
 import org.netbeans.modules.csl.api.{ElementHandle, ElementKind, Modifier, OffsetRange, HtmlFormatter}
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.netbeans.modules.csl.spi.{GsfUtilities, ParserResult}
 import org.openide.filesystems.{FileObject}
 import org.openide.util.Exceptions
diff --git a/scala.debugger.projects/manifest.mf b/scala.debugger.projects/manifest.mf
--- a/scala.debugger.projects/manifest.mf
+++ b/scala.debugger.projects/manifest.mf
@@ -3,5 +3,5 @@
 OpenIDE-Module: org.netbeans.modules.scala.debugger.projects
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/debugger/projects/Bundle.properties
 OpenIDE-Module-Layer: org/netbeans/modules/scala/debugger/projects/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 0.15
+OpenIDE-Module-Specification-Version: 0.16
 
diff --git a/scala.debugger.projects/nbproject/project.xml b/scala.debugger.projects/nbproject/project.xml
--- a/scala.debugger.projects/nbproject/project.xml
+++ b/scala.debugger.projects/nbproject/project.xml
@@ -61,8 +61,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.9</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/scala.editor/nbproject/project.properties b/scala.editor/nbproject/project.properties
--- a/scala.editor/nbproject/project.properties
+++ b/scala.editor/nbproject/project.properties
@@ -1,4 +1,4 @@
-spec.version.base=0.2.0
+spec.version.base=0.3.0
 
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
diff --git a/scala.editor/nbproject/project.xml b/scala.editor/nbproject/project.xml
--- a/scala.editor/nbproject/project.xml
+++ b/scala.editor/nbproject/project.xml
@@ -57,7 +57,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
+                        <release-version>2</release-version>
                         <implementation-version/>
                     </run-dependency>
                 </dependency>
diff --git a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/ElementDescription.scala b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/ElementDescription.scala
--- a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/ElementDescription.scala
+++ b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/ElementDescription.scala
@@ -45,7 +45,7 @@
 import org.openide.util.NbBundle
 
 import org.netbeans.modules.csl.api.Modifier
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.netbeans.modules.scala.core.ScalaParserResult
 import org.netbeans.modules.scala.core.element.ScalaElements
 
diff --git a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotation.scala b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotation.scala
--- a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotation.scala
+++ b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotation.scala
@@ -46,7 +46,7 @@
 import javax.swing.text.JTextComponent
 import javax.swing.text.Position
 import javax.swing.text.StyledDocument
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.openide.filesystems.FileObject
 import org.openide.text.Annotation
 import org.openide.text.NbDocument
diff --git a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotationHandlerFactory.scala b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotationHandlerFactory.scala
--- a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotationHandlerFactory.scala
+++ b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotationHandlerFactory.scala
@@ -40,18 +40,17 @@
  */
 package org.netbeans.modules.scala.editor.overridden
 
-import org.netbeans.modules.csl.core.AbstractTaskFactory
-import org.netbeans.modules.csl.core.Language
 import org.netbeans.modules.parsing.api.Snapshot
 import org.netbeans.modules.parsing.spi.SchedulerTask
+import org.netbeans.modules.parsing.spi.TaskFactory
 
 /**
  * 
  * @author Caoyuan Deng
  */
-class IsOverriddenAnnotationHandlerFactory extends AbstractTaskFactory(true) { // XXX: Phase.RESOLVED, Priority.BELOW_NORMAL
+class IsOverriddenAnnotationHandlerFactory extends TaskFactory() { // XXX: Phase.RESOLVED, Priority.BELOW_NORMAL
 
-  override def createTasks(l: Language, snapshot: Snapshot): java.util.Collection[_ <: SchedulerTask] = {
+  override def create(snapshot: Snapshot): java.util.Collection[_ <: SchedulerTask] = {
     java.util.Collections.singleton(new IsOverriddenAnnotationHandler(snapshot.getSource.getFileObject))
   }
 
diff --git a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenPopup.scala b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenPopup.scala
--- a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenPopup.scala
+++ b/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenPopup.scala
@@ -57,7 +57,7 @@
 import org.netbeans.api.java.source.JavaSource;
 import org.netbeans.api.java.source.SourceUtils;
 import org.netbeans.api.java.source.ui.ElementOpen;
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.openide.filesystems.FileObject;
 
 /**
diff --git a/scala.project/manifest.mf b/scala.project/manifest.mf
--- a/scala.project/manifest.mf
+++ b/scala.project/manifest.mf
@@ -3,5 +3,5 @@
 OpenIDE-Module: org.netbeans.modules.scala.project
 OpenIDE-Module-Layer: org/netbeans/modules/scala/project/ui/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.3.4
+OpenIDE-Module-Specification-Version: 1.4
 
diff --git a/scala.project/nbproject/project.xml b/scala.project/nbproject/project.xml
--- a/scala.project/nbproject/project.xml
+++ b/scala.project/nbproject/project.xml
@@ -117,8 +117,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.9</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/scala.refactoring/manifest.mf b/scala.refactoring/manifest.mf
--- a/scala.refactoring/manifest.mf
+++ b/scala.refactoring/manifest.mf
@@ -3,4 +3,4 @@
 OpenIDE-Module: org.netbeans.modules.scala.refactoring
 OpenIDE-Module-Layer: org/netbeans/modules/scala/refactoring/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/refactoring/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.3
+OpenIDE-Module-Specification-Version: 0.4
diff --git a/scala.refactoring/nbproject/project.xml b/scala.refactoring/nbproject/project.xml
--- a/scala.refactoring/nbproject/project.xml
+++ b/scala.refactoring/nbproject/project.xml
@@ -54,8 +54,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.8</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/scala.refactoring/src/org/netbeans/modules/scala/refactoring/WhereUsedQueryPlugin.scala b/scala.refactoring/src/org/netbeans/modules/scala/refactoring/WhereUsedQueryPlugin.scala
--- a/scala.refactoring/src/org/netbeans/modules/scala/refactoring/WhereUsedQueryPlugin.scala
+++ b/scala.refactoring/src/org/netbeans/modules/scala/refactoring/WhereUsedQueryPlugin.scala
@@ -58,7 +58,7 @@
 import org.netbeans.api.lexer.TokenSequence;
 import org.netbeans.api.lexer.TokenUtilities;
 import org.netbeans.editor.BaseDocument;
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.netbeans.modules.csl.spi.GsfUtilities;
 import org.netbeans.modules.csl.spi.support.ModificationResult;
 import org.netbeans.modules.parsing.api.Source
diff --git a/scala.refactoring/src/org/netbeans/modules/scala/refactoring/ui/tree/FolderTreeElement.scala b/scala.refactoring/src/org/netbeans/modules/scala/refactoring/ui/tree/FolderTreeElement.scala
--- a/scala.refactoring/src/org/netbeans/modules/scala/refactoring/ui/tree/FolderTreeElement.scala
+++ b/scala.refactoring/src/org/netbeans/modules/scala/refactoring/ui/tree/FolderTreeElement.scala
@@ -49,7 +49,7 @@
 import org.netbeans.api.project.ProjectUtils;
 import org.netbeans.api.project.SourceGroup;
 import org.netbeans.api.project.Sources
-import org.netbeans.modules.csl.core.UiUtils
+import org.netbeans.modules.csl.api.UiUtils
 import org.netbeans.modules.refactoring.spi.ui.TreeElement
 import org.netbeans.modules.refactoring.spi.ui.TreeElementFactory
 import org.openide.filesystems.FileObject;