diff --git a/docs/plugin_context.cml b/docs/plugin_context.cml
new file mode 100644
index 0000000..7223543
--- /dev/null
+++ b/docs/plugin_context.cml
@@ -0,0 +1,7 @@
+ContextMap {
+    contains IntelliJPlugin, LanguageServer
+    IntelliJPlugin [D] <- [U,PL,OHS] LanguageServer
+}
+
+BoundedContext IntelliJPlugin
+BoundedContext LanguageServer
\ No newline at end of file
diff --git a/lsp/package.json b/lsp/package.json
index 26fc69e..7b8ce08 100644
--- a/lsp/package.json
+++ b/lsp/package.json
@@ -2,6 +2,6 @@
   "name": "context-mapper-intellij-plugin",
   "private": true,
   "dependencies": {
-    "@lstreckeisen/context-mapper-language-server": "0.0.2"
+    "@lstreckeisen/context-mapper-language-server": "0.0.3"
   }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/org/contextmapper/intellij/lang/CMLFileType.kt b/src/main/kotlin/org/contextmapper/intellij/lang/CMLFileType.kt
index 48b6252..95a1451 100644
--- a/src/main/kotlin/org/contextmapper/intellij/lang/CMLFileType.kt
+++ b/src/main/kotlin/org/contextmapper/intellij/lang/CMLFileType.kt
@@ -7,9 +7,9 @@ import org.jetbrains.annotations.NonNls
 import javax.swing.Icon
 
 class CMLFileType : LanguageFileType(CMLLanguage.INSTANCE) {
-    override fun getName(): @NonNls String = "Context Mapper DSL File"
+    override fun getName(): @NonNls String = "Context Mapper DSL"
 
-    override fun getDescription(): @NlsContexts.Label String = "Context Mapper DSL file"
+    override fun getDescription(): @NlsContexts.Label String = "Context Mapper DSL"
 
     @Suppress("UnstableApiUsage") // NlsSafe is used by interface
     override fun getDefaultExtension(): @NlsSafe String = "cml"
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index d5d684c..f5ba09b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -18,7 +18,7 @@
     <!-- Extension points defined by the plugin.
          Read more: https://plugins.jetbrains.com/docs/intellij/plugin-extension-points.html -->
     <extensions defaultExtensionNs="com.intellij">
-        <fileType name="Context Mapper DSL File"
+        <fileType name="Context Mapper DSL"
                   implementationClass="org.contextmapper.intellij.lang.CMLFileType"
                   fieldName="INSTANCE"
                   language="Context Mapper DSL"
@@ -29,7 +29,7 @@
                              implementationClass="com.redhat.devtools.lsp4ij.features.foldingRange.LSPFoldingRangeBuilder"
         />
         <lang.fileViewProviderFactory language="Context Mapper DSL"
-                                      implementationClass="com.redhat.devtools.lsp4ij.features.semanticTokens.viewProvider.LSPSemanticTokensFileViewProviderFactory"
+                                      implementationClass="com.redhat.devtools.lsp4ij.features.semanticTokens.viewProvider.LSPSemanticTokensStructurelessFileViewProviderFactory"
                                       />
         <lang.psiStructureViewFactory language="Context Mapper DSL"
                                       implementationClass="com.redhat.devtools.lsp4ij.features.documentSymbol.LSPDocumentSymbolStructureViewFactory"
@@ -37,12 +37,6 @@
         <typeHierarchyProvider language="Context Mapper DSL"
                                implementationClass="com.redhat.devtools.lsp4ij.features.typeHierarchy.LSPTypeHierarchyProvider"
                                />
-        <codeInsight.parameterInfo language="Context Mapper DSL"
-                                   implementationClass="com.redhat.devtools.lsp4ij.features.signatureHelp.LSPParameterInfoHandler"
-                                   />
-        <callHierarchyProvider language="Context Mapper DSL"
-                               implementationClass="com.redhat.devtools.lsp4ij.features.callHierarchy.LSPCallHierarchyProvider"
-                               />
 
     </extensions>
 
@@ -59,7 +53,7 @@
             </description>
         </server>
 
-        <languageMapping language="Context Mapper DSL" serverId="cml-language-server"/>
+        <languageMapping language="Context Mapper DSL" serverId="cml-language-server" languageId="Context Mapper DSL"/>
 
         <semanticTokensColorsProvider serverId="cml-language-server"
                                       class="org.contextmapper.intellij.syntaxhighlighting.ContextMapperDSLSemanticTokensColorProvider"