From d10dda0dd4a218003fc8b614e4a599150c362e92 Mon Sep 17 00:00:00 2001
From: Mykhailo Lytvyn <lytvyn.michael@gmail.com>
Date: Thu, 2 Mar 2023 15:15:26 +0100
Subject: [PATCH] #257 | Improved performance of the Global Meta Model and TS
 LineMarker

---
 resources/META-INF/plugin-release-info.xml    |   6 +-
 .../AbstractItemLineMarkerProvider.java       |  98 -------------
 ...AbstractTSAttributeLineMarkerProvider.java | 135 ------------------
 .../AbstractTSAttributeLineMarkerProvider.kt  |  83 +++++++++++
 .../AbstractTSItemLineMarkerProvider.kt       |  83 +++++++++++
 .../daemon/BSEnumValueLineMarkerProvider.kt   |   4 +-
 .../daemon/BSPropertyLineMarkerProvider.kt    |   4 +-
 .../daemon/BSTypeLineMarkerProvider.kt        |   4 +-
 .../TSAttributeFieldLineMarkerProvider.kt     |  27 ++--
 .../TSAttributeMethodLineMarkerProvider.kt    |  18 +--
 .../daemon/TSEnumValueLineMarkerProvider.kt   |   4 +-
 .../TSInterceptorModelLineMarkerProvider.kt   |  25 ++--
 .../daemon/TSTypeLineMarkerProvider.java      |  82 -----------
 .../daemon/TSTypeLineMarkerProvider.kt        |  58 ++++++++
 ...bleMustExistForItemExtendingGenericItem.kt |   2 +-
 ...entTypeCodeMustBeGreaterThanTenThousand.kt |   2 +-
 .../TSDeploymentTypeCodeMustBeUnique.kt       |   2 +-
 ...TypeCodeReservedForB2BCommerceExtension.kt |   2 +-
 ...mentTypeCodeReservedForCommonsExtension.kt |   2 +-
 ...ypeCodeReservedForLegacyXPrintExtension.kt |   2 +-
 ...oymentTypeCodeReservedForPrintExtension.kt |   2 +-
 ...tTypeCodeReservedForProcessingExtension.kt |   2 +-
 ...ustBeGreaterThanTenThousandForRelations.kt |   2 +-
 .../plugin/hybris/common/HybrisConstants.kt   |   1 +
 .../TSAttributeHandlerGutterAnnotator.kt      |   4 +-
 .../folding/ImpexMacroFoldingBuilder.java     |   4 +-
 .../hybris/psi/reference/SpringReference.kt   |   4 +-
 .../system/bean/meta/BSGlobalMetaModel.kt     |  18 ++-
 .../system/bean/meta/BSMetaModelMerger.kt     |   2 +-
 .../bean/meta/impl/BSMetaModelAccessImpl.kt   |  34 +++--
 .../bean/meta/impl/BSMetaModelMergerImpl.kt   |   7 +-
 .../cockpitng/meta/CngGlobalMetaModel.kt      |  27 +++-
 .../cockpitng/meta/CngMetaModelMerger.kt      |   3 +-
 .../meta/impl/CngMetaModelAccessImpl.kt       |  35 +++--
 .../meta/impl/CngMetaModelMergerImpl.kt       |   7 +-
 .../AttributeHandlerReferenceConverter.kt     |  18 ++-
 .../system/type/meta/TSGlobalMetaModel.kt     |  40 +++---
 .../system/type/meta/TSMetaModelAccess.kt     |   2 +-
 .../system/type/meta/TSMetaModelMerger.kt     |   2 +-
 .../type/meta/impl/CaseInsensitive.java       |  40 +++---
 .../type/meta/impl/TSMetaModelAccessImpl.kt   |  42 ++++--
 .../type/meta/impl/TSMetaModelMergerImpl.kt   |   6 +-
 .../type/psi/reference/PlainXmlReference.kt   |   5 +-
 .../type/psi/reference/SpringReference.kt     |   4 +-
 44 files changed, 468 insertions(+), 486 deletions(-)
 delete mode 100644 src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractItemLineMarkerProvider.java
 delete mode 100644 src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.java
 create mode 100644 src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.kt
 create mode 100644 src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSItemLineMarkerProvider.kt
 delete mode 100644 src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.java
 create mode 100644 src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.kt

diff --git a/resources/META-INF/plugin-release-info.xml b/resources/META-INF/plugin-release-info.xml
index 9eba62291..b21187973 100644
--- a/resources/META-INF/plugin-release-info.xml
+++ b/resources/META-INF/plugin-release-info.xml
@@ -48,7 +48,7 @@
                 <li><a href="https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/setting_up_environment.html">How to Configure Project Environment For Plugin Developers</a></li>
                 <li>We are working with <a href="https://help.github.com/articles/about-pull-requests/">Pull Requests</a>. You need to fork this repository, implement a feature in a separate branch, then send us a pull request.</li>
                 <li>Be sure to include into your pull request and all commit messages the following line: "Signed-off-by: Your Real Name your.email@email.com" otherwise it can not be accepted. Use your real name.</li>
-                <li>For additional questions you can send an <a href="mailto:hybrisideaplugin@epam.com">email</a></li>§
+                <li>For additional questions you can send an <a href="mailto:hybrisideaplugin@epam.com">email</a></li>
             </ul>
 
             <h3>Contributors and Developers</h3>
@@ -91,6 +91,10 @@
 
     <change-notes>
         <![CDATA[
+            <h3>2023.1.2</h3>
+            <ul>
+                <li><i>Feature:</i> Improved performance of the Global Meta Model and TS LineMarker (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/257" target="_blank" rel="nofollow">#257</a>)</li>
+            </ul>
             <h3>2023.1.1</h3>
             <ul>
                 <li><i>Feature:</i> Added possibility to import CCv2 folders as modules (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/238" target="_blank" rel="nofollow">#238</a>)</li>
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractItemLineMarkerProvider.java b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractItemLineMarkerProvider.java
deleted file mode 100644
index 30d3d1cb5..000000000
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractItemLineMarkerProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.intellij.idea.plugin.hybris.codeInsight.daemon;
-
-import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
-import com.intellij.codeInsight.daemon.RelatedItemLineMarkerProvider;
-import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
-import com.intellij.idea.plugin.hybris.common.HybrisConstants;
-import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescriptor;
-import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescriptorType;
-import com.intellij.openapi.editor.markup.GutterIconRenderer;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiIdentifier;
-import com.intellij.psi.xml.XmlElement;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.Optional;
-
-@SuppressWarnings("unchecked")
-public abstract class AbstractItemLineMarkerProvider<T extends PsiElement> extends RelatedItemLineMarkerProvider {
-
-    protected static String cleanSearchName(final String searchName) {
-        if (searchName == null) {
-            return null;
-        }
-
-        final int idx = searchName.lastIndexOf(HybrisConstants.MODEL_SUFFIX);
-        if (idx == -1) {
-            return searchName;
-        }
-        return searchName.substring(0, idx);
-    }
-
-    @Override
-    protected void collectNavigationMarkers(
-        @NotNull final PsiElement element,
-        @NotNull final Collection<? super RelatedItemLineMarkerInfo<?>> result
-    ) {
-        if (!canProcess(element)) return;
-
-        final var module = ModuleUtil.findModuleForPsiElement(element);
-        if (module == null || !isPlatformModule(module)) return;
-
-        collectDeclarations((T) element)
-            .ifPresent(result::add);
-    }
-
-    private static boolean isPlatformModule(final @NotNull Module module) {
-        return Objects.equals(HybrisModuleDescriptor.getDescriptorType(module), HybrisModuleDescriptorType.PLATFORM);
-    }
-
-    protected abstract boolean canProcess(final PsiElement psi);
-
-    protected abstract Optional<RelatedItemLineMarkerInfo<PsiElement>> collectDeclarations(final T psi);
-
-    protected @NotNull RelatedItemLineMarkerInfo<PsiElement> createTargetsWithGutterIcon(
-        final PsiIdentifier psiIdentifier,
-        final Collection<XmlElement> list,
-        final Icon icon
-    ) {
-        return NavigationGutterIconBuilder
-            .create(icon)
-            .setTargets(list)
-            .setEmptyPopupText(getEmptyPopupText())
-            .setPopupTitle(getPopupTitle())
-            .setTooltipText(getTooltipText())
-            .setAlignment(GutterIconRenderer.Alignment.LEFT)
-            .createLineMarkerInfo(psiIdentifier);
-    }
-
-    protected abstract String getEmptyPopupText();
-
-    protected abstract String getPopupTitle();
-
-    protected abstract String getTooltipText();
-
-}
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.java b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.java
deleted file mode 100644
index 1be315675..000000000
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.intellij.idea.plugin.hybris.codeInsight.daemon;
-
-import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
-import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils;
-import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons;
-import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess;
-import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaItem;
-import com.intellij.idea.plugin.hybris.system.type.meta.model.TSMetaClassifier;
-import com.intellij.idea.plugin.hybris.system.type.meta.model.TSMetaRelation;
-import com.intellij.idea.plugin.hybris.system.type.utils.ModelsUtils;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiIdentifier;
-import com.intellij.psi.xml.XmlElement;
-import com.intellij.util.xml.DomAnchor;
-import com.intellij.util.xml.DomElement;
-
-import javax.swing.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-public abstract class AbstractTSAttributeLineMarkerProvider< T extends PsiElement> extends AbstractItemLineMarkerProvider<T> {
-
-    @Override
-    protected Optional<RelatedItemLineMarkerInfo<PsiElement>> collectDeclarations(final T psi) {
-        if (!(psi.getParent() instanceof final PsiClass psiClass)) return Optional.empty();
-        if (!ModelsUtils.isModelFile(psiClass)) return Optional.empty();
-
-        final var project = psi.getProject();
-        final var metaService = TSMetaModelAccess.Companion.getInstance(project);
-        final var meta = metaService.findMetaItemByName(cleanSearchName(psiClass.getName()));
-
-        if (meta == null) {
-            return Optional.empty();
-        }
-
-        return collect(meta, psi);
-    }
-
-    protected abstract Optional<RelatedItemLineMarkerInfo<PsiElement>> collect(final TSGlobalMetaItem meta, final T psi);
-
-    protected Optional<RelatedItemLineMarkerInfo<PsiElement>> getPsiElementRelatedItemLineMarkerInfo(
-        final TSGlobalMetaItem meta, final String name, final PsiIdentifier nameIdentifier
-    ) {
-        final var elements = getAttributeElements(meta, name);
-        if (elements.isEmpty()) {
-            final var groupedRelElements = getRelations(meta, name);
-            return getRelationMarkers(groupedRelElements, TSMetaRelation.RelationEnd.SOURCE,
-                                      HybrisIcons.TS_RELATION_SOURCE,
-                                      nameIdentifier
-            )
-                .or(() -> getRelationMarkers(
-                    groupedRelElements,
-                    TSMetaRelation.RelationEnd.TARGET,
-                    HybrisIcons.TS_RELATION_TARGET, nameIdentifier
-                ));
-        } else {
-            return Optional.of(createTargetsWithGutterIcon(nameIdentifier, elements, HybrisIcons.TS_ATTRIBUTE));
-        }
-    }
-
-    @Override
-    protected String getTooltipText() {
-        return HybrisI18NBundleUtils.message("hybris.editor.gutter.item.attribute.tooltip.navigate.declaration");
-    }
-
-    @Override
-    protected String getPopupTitle() {
-        return HybrisI18NBundleUtils.message("hybris.editor.gutter.bean.attribute.navigate.choose.class.title");
-    }
-
-    @Override
-    protected String getEmptyPopupText() {
-        return HybrisI18NBundleUtils.message("hybris.editor.gutter.navigate.no.matching.attributes");
-    }
-
-    private static List<XmlElement> getAttributeElements(final TSGlobalMetaItem meta, final String name) {
-        return meta.getAllAttributes().stream()
-                   .filter(attr -> attr.getName().equals(name))
-                   .map(TSGlobalMetaItem.TSGlobalMetaItemAttribute::getDeclarations)
-                   .flatMap(Collection::stream)
-                   .map(TSMetaClassifier::getDomAnchor)
-                   .map(DomAnchor::retrieveDomElement)
-                   .filter(Objects::nonNull)
-                   .map(DomElement::getXmlElement)
-                   .toList();
-    }
-
-    private static Map<TSMetaRelation.RelationEnd, List<XmlElement>> getRelations(final TSGlobalMetaItem meta, final String name) {
-        return meta.getAllRelationEnds().stream()
-                   .filter(rel -> rel.getQualifier().equals(name))
-                   .filter(TSMetaRelation.TSMetaRelationElement::isNavigable)
-                   .filter(rel -> rel.getDomAnchor().retrieveDomElement() != null)
-                   .collect(
-                       Collectors.groupingBy(
-                           TSMetaRelation.TSMetaRelationElement::getEnd,
-                           Collectors.mapping(
-                               rel -> Objects.requireNonNull(rel.getDomAnchor().retrieveDomElement()).getXmlElement(),
-                               Collectors.toList()
-                           )
-                       )
-                   );
-    }
-
-    private Optional<RelatedItemLineMarkerInfo<PsiElement>> getRelationMarkers(
-        final Map<TSMetaRelation.RelationEnd, List<XmlElement>> groupedRelElements,
-        final TSMetaRelation.RelationEnd target,
-        final Icon icon, final PsiIdentifier nameIdentifier
-    ) {
-        return Optional.ofNullable(groupedRelElements.get(target))
-                       .map(relElements -> createTargetsWithGutterIcon(nameIdentifier, relElements, icon));
-    }
-}
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.kt
new file mode 100644
index 000000000..35d0a722a
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSAttributeLineMarkerProvider.kt
@@ -0,0 +1,83 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.intellij.idea.plugin.hybris.codeInsight.daemon
+
+import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo
+import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
+import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons
+import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
+import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaItem
+import com.intellij.idea.plugin.hybris.system.type.meta.model.TSMetaRelation.RelationEnd
+import com.intellij.idea.plugin.hybris.system.type.utils.ModelsUtils
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiIdentifier
+import com.intellij.psi.xml.XmlElement
+import javax.swing.Icon
+
+abstract class AbstractTSAttributeLineMarkerProvider<T : PsiElement> : AbstractTSItemLineMarkerProvider<T>() {
+
+    override fun getTooltipText() = message("hybris.editor.gutter.item.attribute.tooltip.navigate.declaration")
+    override fun getPopupTitle() = message("hybris.editor.gutter.bean.attribute.navigate.choose.class.title")
+    override fun getEmptyPopupText() = message("hybris.editor.gutter.navigate.no.matching.attributes")
+
+    override fun collectDeclarations(psi: T): RelatedItemLineMarkerInfo<PsiElement>? {
+        val psiClass = psi.parent
+        if (psiClass !is PsiClass || !ModelsUtils.isModelFile(psiClass)) return null
+
+        return TSMetaModelAccess.getInstance(psi.project).findMetaItemByName(cleanSearchName(psiClass.name))
+            ?.let { collect(it, psi) }
+    }
+
+    protected abstract fun collect(meta: TSGlobalMetaItem, psi: T): RelatedItemLineMarkerInfo<PsiElement>?
+
+    protected open fun getPsiElementRelatedItemLineMarkerInfo(
+        meta: TSGlobalMetaItem, name: String, nameIdentifier: PsiIdentifier
+    ) = with(getAttributeElements(meta, name)) {
+        if (this.isEmpty()) {
+            val groupedRelElements = getRelations(meta, name)
+            return@with getRelationMarkers(groupedRelElements, RelationEnd.SOURCE, HybrisIcons.TS_RELATION_SOURCE, nameIdentifier)
+                ?: getRelationMarkers(groupedRelElements, RelationEnd.TARGET, HybrisIcons.TS_RELATION_TARGET, nameIdentifier)
+        } else {
+            return@with createTargetsWithGutterIcon(nameIdentifier, this, HybrisIcons.TS_ATTRIBUTE)
+        }
+    }
+
+    open fun getAttributeElements(meta: TSGlobalMetaItem, name: String) = meta.allAttributes
+        .filter { it.name == name }
+        .flatMap { it.declarations }
+        .map { it.domAnchor }
+        .mapNotNull { it.retrieveDomElement() }
+        .mapNotNull { it.xmlElement }
+
+    open fun getRelations(meta: TSGlobalMetaItem, name: String) = meta.allRelationEnds
+        .filter { it.qualifier == name }
+        .filter { it.isNavigable }
+        .filter { it.domAnchor.retrieveDomElement()?.xmlElement != null }
+        .groupBy({ it.end }, { it.domAnchor.retrieveDomElement()!!.xmlElement!! })
+
+    open fun getRelationMarkers(
+        groupedRelElements: Map<RelationEnd, List<XmlElement?>>,
+        target: RelationEnd,
+        icon: Icon,
+        nameIdentifier: PsiIdentifier
+    ) = groupedRelElements[target]
+        ?.let { createTargetsWithGutterIcon(nameIdentifier, it, icon) }
+
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSItemLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSItemLineMarkerProvider.kt
new file mode 100644
index 000000000..392d9bfae
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/AbstractTSItemLineMarkerProvider.kt
@@ -0,0 +1,83 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.intellij.idea.plugin.hybris.codeInsight.daemon
+
+import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo
+import com.intellij.codeInsight.daemon.RelatedItemLineMarkerProvider
+import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder
+import com.intellij.idea.plugin.hybris.common.HybrisConstants
+import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescriptor
+import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescriptorType
+import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
+import com.intellij.openapi.editor.markup.GutterIconRenderer
+import com.intellij.openapi.module.ModuleUtilCore
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiIdentifier
+import com.intellij.psi.util.CachedValueProvider
+import com.intellij.psi.util.CachedValuesManager
+import com.intellij.psi.xml.XmlElement
+import javax.swing.Icon
+
+@Suppress("UNCHECKED_CAST")
+abstract class AbstractTSItemLineMarkerProvider<T : PsiElement> : RelatedItemLineMarkerProvider() {
+
+    protected abstract fun canProcess(psi: PsiElement): Boolean
+    protected abstract fun collectDeclarations(psi: T): RelatedItemLineMarkerInfo<PsiElement>?
+    protected abstract fun getEmptyPopupText(): String
+    protected abstract fun getPopupTitle(): String
+    protected abstract fun getTooltipText(): String
+
+    override fun collectNavigationMarkers(
+        element: PsiElement,
+        result: MutableCollection<in RelatedItemLineMarkerInfo<*>?>
+    ) {
+        if (!canProcess(element)) return
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return
+        if (HybrisModuleDescriptor.getDescriptorType(module) != HybrisModuleDescriptorType.PLATFORM) return
+
+        CachedValuesManager.getCachedValue(element) {
+            CachedValueProvider.Result.create(
+                collectDeclarations(element as T),
+                TSMetaModelAccess.getInstance(element.project).getMetaModel()
+            )
+        }
+            ?.let { result.add(it) }
+    }
+
+    protected fun createTargetsWithGutterIcon(
+        psiIdentifier: PsiIdentifier?,
+        list: Collection<XmlElement?>?,
+        icon: Icon?
+    ) = NavigationGutterIconBuilder
+        .create(icon!!)
+        .setTargets(list!!)
+        .setEmptyPopupText(getEmptyPopupText())
+        .setPopupTitle(getPopupTitle())
+        .setTooltipText(getTooltipText())
+        .setAlignment(GutterIconRenderer.Alignment.LEFT)
+        .createLineMarkerInfo(psiIdentifier!!)
+
+    protected fun cleanSearchName(searchName: String?): String? {
+        if (searchName == null) return null
+
+        val idx = searchName.lastIndexOf(HybrisConstants.MODEL_SUFFIX)
+        return if (idx == -1) {
+            searchName
+        } else searchName.substring(0, idx)
+    }
+}
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSEnumValueLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSEnumValueLineMarkerProvider.kt
index 329431cb6..5ad8c01e0 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSEnumValueLineMarkerProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSEnumValueLineMarkerProvider.kt
@@ -28,7 +28,7 @@ import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescripto
 import com.intellij.idea.plugin.hybris.system.bean.BeansUtils
 import com.intellij.idea.plugin.hybris.system.bean.meta.BSMetaModelAccess
 import com.intellij.openapi.editor.markup.GutterIconRenderer
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiEnumConstant
 
@@ -39,7 +39,7 @@ class BSEnumValueLineMarkerProvider : RelatedItemLineMarkerProvider() {
         result: MutableCollection<in RelatedItemLineMarkerInfo<*>>
     ) {
         if (element !is PsiEnumConstant || element.containingClass == null) return
-        val module = ModuleUtil.findModuleForPsiElement(element) ?: return
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return
         val psiClass = element.containingClass!!
         if (getDescriptorType(module) != HybrisModuleDescriptorType.PLATFORM) return
         if (!BeansUtils.isEnumFile(psiClass)) return
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSPropertyLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSPropertyLineMarkerProvider.kt
index fff966ee5..eda7ed4d8 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSPropertyLineMarkerProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSPropertyLineMarkerProvider.kt
@@ -28,7 +28,7 @@ import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescripto
 import com.intellij.idea.plugin.hybris.system.bean.BeansUtils
 import com.intellij.idea.plugin.hybris.system.bean.meta.BSMetaModelAccess
 import com.intellij.openapi.editor.markup.GutterIconRenderer
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiField
 
@@ -39,7 +39,7 @@ class BSPropertyLineMarkerProvider : RelatedItemLineMarkerProvider() {
         result: MutableCollection<in RelatedItemLineMarkerInfo<*>>
     ) {
         if (element !is PsiField || element.containingClass == null) return
-        val module = ModuleUtil.findModuleForPsiElement(element) ?: return
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return
         val psiClass = element.containingClass!!
         if (getDescriptorType(module) != HybrisModuleDescriptorType.PLATFORM) return
         if (BeansUtils.isEnumFile(psiClass)) return
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSTypeLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSTypeLineMarkerProvider.kt
index e0eeed00d..981613dac 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSTypeLineMarkerProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/BSTypeLineMarkerProvider.kt
@@ -28,7 +28,7 @@ import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescripto
 import com.intellij.idea.plugin.hybris.system.bean.BeansUtils
 import com.intellij.idea.plugin.hybris.system.bean.meta.BSMetaModelAccess
 import com.intellij.openapi.editor.markup.GutterIconRenderer
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 
@@ -40,7 +40,7 @@ class BSTypeLineMarkerProvider : RelatedItemLineMarkerProvider() {
     ) {
         if (element !is PsiClass) return
         val name = element.qualifiedName ?: return
-        val module = ModuleUtil.findModuleForPsiElement(element) ?: return
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return
         if (getDescriptorType(module) != HybrisModuleDescriptorType.PLATFORM) return
         if (!BeansUtils.isGeneratedFile(element)) return
 
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeFieldLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeFieldLineMarkerProvider.kt
index 6b6376f62..1283051a9 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeFieldLineMarkerProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeFieldLineMarkerProvider.kt
@@ -18,7 +18,7 @@
 
 package com.intellij.idea.plugin.hybris.codeInsight.daemon
 
-import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo
+import com.intellij.idea.plugin.hybris.common.HybrisConstants
 import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons
 import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
 import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaItem
@@ -28,33 +28,28 @@ import com.intellij.psi.PsiIdentifier
 import com.intellij.psi.PsiLiteralExpression
 import com.intellij.psi.impl.source.PsiClassReferenceType
 import com.intellij.psi.util.childrenOfType
-import java.util.*
 
 class TSAttributeFieldLineMarkerProvider : AbstractTSAttributeLineMarkerProvider<PsiField>() {
 
     override fun canProcess(psi: PsiElement) = psi is PsiField
-            && psi.type is PsiClassReferenceType
-            && (psi.type as PsiClassReferenceType).name == String::class.java.simpleName
+        && psi.name != HybrisConstants.TYPECODE_FIELD_NAME
+        && psi.type is PsiClassReferenceType
+        && (psi.type as PsiClassReferenceType).name == String::class.java.simpleName
 
     override fun collect(meta: TSGlobalMetaItem, psi: PsiField) = psi.childrenOfType<PsiLiteralExpression>()
-        .map {
+        .firstNotNullOfOrNull {
             val name = it.value.toString()
             val nameIdentifier = psi.nameIdentifier
+
             getPsiElementRelatedItemLineMarkerInfo(meta, name, nameIdentifier)
-                .or { getPsiElementRelatedRelationLineMarkerInfo(name, nameIdentifier) }
+                ?: getPsiElementRelatedRelationLineMarkerInfo(name, nameIdentifier)
         }
-        .firstOrNull()
-        ?: Optional.empty()
 
     private fun getPsiElementRelatedRelationLineMarkerInfo(
         name: String,
         nameIdentifier: PsiIdentifier
-    ): Optional<RelatedItemLineMarkerInfo<PsiElement>> {
-        val dom = TSMetaModelAccess.getInstance(nameIdentifier.project).findMetaRelationByName(name)
-            ?.retrieveDom()
-            ?.xmlElement
-            ?: return Optional.empty<RelatedItemLineMarkerInfo<PsiElement>>()
-
-        return Optional.of(createTargetsWithGutterIcon(nameIdentifier, listOf(dom), HybrisIcons.TS_RELATION))
-    }
+    ) = TSMetaModelAccess.getInstance(nameIdentifier.project).findMetaRelationByName(name)
+        ?.retrieveDom()
+        ?.xmlElement
+        ?.let { createTargetsWithGutterIcon(nameIdentifier, listOf(it), HybrisIcons.TS_RELATION) }
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeMethodLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeMethodLineMarkerProvider.kt
index ac6365407..79fbcd682 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeMethodLineMarkerProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSAttributeMethodLineMarkerProvider.kt
@@ -18,24 +18,20 @@
 
 package com.intellij.idea.plugin.hybris.codeInsight.daemon
 
-import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo
+import com.intellij.idea.plugin.hybris.common.HybrisConstants
 import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaItem
 import com.intellij.idea.plugin.hybris.system.type.model.Attribute
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiMethod
-import java.util.*
 
 class TSAttributeMethodLineMarkerProvider : AbstractTSAttributeLineMarkerProvider<PsiMethod>() {
 
     override fun canProcess(psi: PsiElement) = psi is PsiMethod
 
-    override fun collect(meta: TSGlobalMetaItem, psi: PsiMethod): Optional<RelatedItemLineMarkerInfo<PsiElement>> {
-        val annotation = psi.getAnnotation("de.hybris.bootstrap.annotations.Accessor")
-            ?: return Optional.empty()
-
-        return Arrays.stream(annotation.parameterList.attributes)
-            .filter { it.name == Attribute.QUALIFIER }
-            .findFirst()
-            .flatMap { getPsiElementRelatedItemLineMarkerInfo(meta, it.literalValue, it.nameIdentifier) }
-    }
+    override fun collect(meta: TSGlobalMetaItem, psi: PsiMethod) = psi.getAnnotation(HybrisConstants.CLASS_ANNOTATION_ACCESSOR)
+        ?.parameterList
+        ?.attributes
+        ?.filter { it.literalValue != null && it.nameIdentifier != null }
+        ?.firstOrNull { it.name == Attribute.QUALIFIER }
+        ?.let { getPsiElementRelatedItemLineMarkerInfo(meta, it.literalValue!!, it.nameIdentifier!!) }
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSEnumValueLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSEnumValueLineMarkerProvider.kt
index 3c81e7ead..c18987f9d 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSEnumValueLineMarkerProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSEnumValueLineMarkerProvider.kt
@@ -28,7 +28,7 @@ import com.intellij.idea.plugin.hybris.project.descriptors.HybrisModuleDescripto
 import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
 import com.intellij.idea.plugin.hybris.system.type.utils.ModelsUtils
 import com.intellij.openapi.editor.markup.GutterIconRenderer
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiField
 
@@ -39,7 +39,7 @@ class TSEnumValueLineMarkerProvider : RelatedItemLineMarkerProvider() {
         result: MutableCollection<in RelatedItemLineMarkerInfo<*>>
     ) {
         if (element !is PsiField || element.containingClass == null) return
-        val module = ModuleUtil.findModuleForPsiElement(element) ?: return
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return
         val psiClass = element.containingClass!!
         if (getDescriptorType(module) != HybrisModuleDescriptorType.PLATFORM) return
         if (!ModelsUtils.isEnumFile(psiClass)) return
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSInterceptorModelLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSInterceptorModelLineMarkerProvider.kt
index e6c9cda2a..b77964340 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSInterceptorModelLineMarkerProvider.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSInterceptorModelLineMarkerProvider.kt
@@ -28,31 +28,26 @@ import com.intellij.psi.PsiField
 import com.intellij.psi.PsiLiteralExpression
 import com.intellij.psi.util.childrenOfType
 import com.intellij.psi.util.parentOfType
-import java.util.*
 
-class TSInterceptorModelLineMarkerProvider : AbstractItemLineMarkerProvider<PsiField>() {
+class TSInterceptorModelLineMarkerProvider : AbstractTSItemLineMarkerProvider<PsiField>() {
 
-    override fun canProcess(psi: PsiElement?) = psi is PsiField
+    override fun canProcess(psi: PsiElement) = psi is PsiField
             && psi.name == HybrisConstants.TYPECODE_FIELD_NAME
 
     override fun getEmptyPopupText() = message("hybris.editor.gutter.ts.interceptor.no.matches")
     override fun getPopupTitle() = message("hybris.editor.gutter.ts.interceptor.choose.title")
     override fun getTooltipText() = message("hybris.editor.gutter.ts.interceptor.tooltip.text")
 
-    override fun collectDeclarations(psi: PsiField?): Optional<RelatedItemLineMarkerInfo<PsiElement>> {
-        val psiClass = psi?.parentOfType<PsiClass>() ?: return Optional.empty()
-        if (!ModelsUtils.isModelFile(psiClass)) return Optional.empty()
+    override fun collectDeclarations(psi: PsiField): RelatedItemLineMarkerInfo<PsiElement>? {
+        val psiClass = psi.parentOfType<PsiClass>() ?: return null
+        if (!ModelsUtils.isModelFile(psiClass)) return null
         val project = psi.project
 
-        return psi.childrenOfType<PsiLiteralExpression>()
-            .mapNotNull {
-                val typeCode = it.value.toString()
-                TSInterceptorSpringBuilderFactory.createGutterBuilder(project, typeCode)
-                    ?.createSpringGroupLineMarkerInfo(psi.nameIdentifier)
-            }
-            .map { Optional.of(it) }
-            .firstOrNull()
-            ?: Optional.empty()
+        return psi.childrenOfType<PsiLiteralExpression>().firstNotNullOfOrNull {
+            val typeCode = it.value.toString()
+            TSInterceptorSpringBuilderFactory.createGutterBuilder(project, typeCode)
+                ?.createSpringGroupLineMarkerInfo(psi.nameIdentifier)
+        }
     }
 
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.java b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.java
deleted file mode 100644
index 59cc4dd89..000000000
--- a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.intellij.idea.plugin.hybris.codeInsight.daemon;
-
-import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo;
-import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils;
-import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons;
-import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess;
-import com.intellij.idea.plugin.hybris.system.type.utils.ModelsUtils;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiElement;
-import com.intellij.util.xml.DomElement;
-
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * Class for show gutter icon for navigation between *-item.xml and generated classes.
- *
- * @author Nosov Aleksandr
- */
-public class TSTypeLineMarkerProvider extends AbstractItemLineMarkerProvider<PsiClass> {
-
-    @Override
-    protected boolean canProcess(final PsiElement psi) {
-        return psi instanceof PsiClass;
-    }
-
-    @Override
-    protected Optional<RelatedItemLineMarkerInfo<PsiElement>> collectDeclarations(
-        final PsiClass psi
-    ) {
-        final var name = cleanSearchName(psi.getName());
-        final var psiNameIdentifier = psi.getNameIdentifier();
-
-        if (ModelsUtils.isModelFile(psi)) {
-            return Optional.ofNullable(TSMetaModelAccess.Companion.getInstance(psi.getProject()).findMetaItemByName(name))
-                           .map(meta -> meta.retrieveAllDoms().stream()
-                                            .map(DomElement::getXmlElement)
-                                            .collect(Collectors.toList()))
-                           .map(elements -> createTargetsWithGutterIcon(psiNameIdentifier, elements, HybrisIcons.TS_ITEM));
-        } else if (ModelsUtils.isEnumFile(psi)) {
-            return Optional.ofNullable(TSMetaModelAccess.Companion.getInstance(psi.getProject()).findMetaEnumByName(name))
-                           .map(meta -> meta.retrieveAllDoms().stream()
-                                            .map(DomElement::getXmlElement)
-                                            .collect(Collectors.toList()))
-                           .map(elements -> createTargetsWithGutterIcon(psiNameIdentifier, elements, HybrisIcons.TS_ENUM));
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    protected String getTooltipText() {
-        return HybrisI18NBundleUtils.message("hybris.editor.gutter.item.class.tooltip.navigate.declaration");
-    }
-
-    @Override
-    protected String getPopupTitle() {
-        return HybrisI18NBundleUtils.message("hybris.editor.gutter.bean.type.navigate.choose.class.title");
-    }
-
-    @Override
-    protected String getEmptyPopupText() {
-        return HybrisI18NBundleUtils.message("hybris.editor.gutter.navigate.no.matching.beans");
-    }
-}
diff --git a/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.kt b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.kt
new file mode 100644
index 000000000..721e51ebf
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/codeInsight/daemon/TSTypeLineMarkerProvider.kt
@@ -0,0 +1,58 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.intellij.idea.plugin.hybris.codeInsight.daemon
+
+import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo
+import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils
+import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons
+import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
+import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaClassifier
+import com.intellij.idea.plugin.hybris.system.type.utils.ModelsUtils
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiIdentifier
+import javax.swing.Icon
+
+class TSTypeLineMarkerProvider : AbstractTSItemLineMarkerProvider<PsiClass>() {
+
+    override fun canProcess(psi: PsiElement) = psi is PsiClass
+    override fun getTooltipText() = HybrisI18NBundleUtils.message("hybris.editor.gutter.item.class.tooltip.navigate.declaration")
+    override fun getPopupTitle() = HybrisI18NBundleUtils.message("hybris.editor.gutter.bean.type.navigate.choose.class.title")
+    override fun getEmptyPopupText() = HybrisI18NBundleUtils.message("hybris.editor.gutter.navigate.no.matching.beans")
+
+    override fun collectDeclarations(
+        psi: PsiClass
+    ): RelatedItemLineMarkerInfo<PsiElement>? {
+        val name = cleanSearchName(psi.name)
+        val psiNameIdentifier = psi.nameIdentifier
+
+        if (ModelsUtils.isModelFile(psi)) {
+            return collectItemTypes(TSMetaModelAccess.getInstance(psi.project).findMetaItemByName(name), psiNameIdentifier, HybrisIcons.TS_ITEM)
+        } else if (ModelsUtils.isEnumFile(psi)) {
+            return collectItemTypes(TSMetaModelAccess.getInstance(psi.project).findMetaEnumByName(name), psiNameIdentifier, HybrisIcons.TS_ENUM)
+        }
+        return null
+    }
+
+    private fun collectItemTypes(meta: TSGlobalMetaClassifier<*>?, psiNameIdentifier: PsiIdentifier?, icon: Icon) = meta
+        ?.retrieveAllDoms()
+        ?.mapNotNull { it.xmlElement }
+        ?.toList()
+        ?.let { createTargetsWithGutterIcon(psiNameIdentifier, it, icon) }
+
+}
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTableMustExistForItemExtendingGenericItem.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTableMustExistForItemExtendingGenericItem.kt
index c32f5477c..fd0a6e9d3 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTableMustExistForItemExtendingGenericItem.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTableMustExistForItemExtendingGenericItem.kt
@@ -76,7 +76,7 @@ class TSDeploymentTableMustExistForItemExtendingGenericItem : AbstractTSInspecti
 
         val attributes = sortedMapOf(
             Deployment.TABLE to dom.code.stringValue,
-            Deployment.TYPE_CODE to TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString(),
+            Deployment.TYPE_CODE to TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString(),
         )
 
         holder.createProblem(
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeGreaterThanTenThousand.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeGreaterThanTenThousand.kt
index 120f18076..385b4f14f 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeGreaterThanTenThousand.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeGreaterThanTenThousand.kt
@@ -54,7 +54,7 @@ class TSDeploymentTypeCodeMustBeGreaterThanTenThousand : AbstractCustomOnlyTSIns
                 displayName,
                 XmlUpdateAttributeQuickFix(
                     Deployment.TYPE_CODE,
-                    TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                    TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
                 )
             )
         }
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeUnique.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeUnique.kt
index 2eca0a1fa..30364a942 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeUnique.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeMustBeUnique.kt
@@ -58,7 +58,7 @@ class TSDeploymentTypeCodeMustBeUnique : AbstractTSInspection() {
             displayName,
             XmlUpdateAttributeQuickFix(
                 Deployment.TYPE_CODE,
-                TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
             )
         )
     }
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForB2BCommerceExtension.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForB2BCommerceExtension.kt
index b4770c29b..9f9fe520e 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForB2BCommerceExtension.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForB2BCommerceExtension.kt
@@ -55,7 +55,7 @@ class TSDeploymentTypeCodeReservedForB2BCommerceExtension : AbstractCustomOnlyTS
                 displayName,
                 XmlUpdateAttributeQuickFix(
                     Deployment.TYPE_CODE,
-                    TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                    TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
                 )
             )
         }
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForCommonsExtension.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForCommonsExtension.kt
index f9624528a..7423ebc8a 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForCommonsExtension.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForCommonsExtension.kt
@@ -55,7 +55,7 @@ class TSDeploymentTypeCodeReservedForCommonsExtension : AbstractCustomOnlyTSInsp
                 displayName,
                 XmlUpdateAttributeQuickFix(
                     Deployment.TYPE_CODE,
-                    TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                    TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
                 )
             )
         }
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForLegacyXPrintExtension.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForLegacyXPrintExtension.kt
index ff1b01bad..f0cdd80c6 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForLegacyXPrintExtension.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForLegacyXPrintExtension.kt
@@ -55,7 +55,7 @@ class TSDeploymentTypeCodeReservedForLegacyXPrintExtension : AbstractCustomOnlyT
                 displayName,
                 XmlUpdateAttributeQuickFix(
                     Deployment.TYPE_CODE,
-                    TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                    TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
                 )
             )
         }
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForPrintExtension.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForPrintExtension.kt
index 14e11f4ae..cd2cc000a 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForPrintExtension.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForPrintExtension.kt
@@ -55,7 +55,7 @@ class TSDeploymentTypeCodeReservedForPrintExtension : AbstractCustomOnlyTSInspec
                 displayName,
                 XmlUpdateAttributeQuickFix(
                     Deployment.TYPE_CODE,
-                    TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                    TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
                 )
             )
         }
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForProcessingExtension.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForProcessingExtension.kt
index c5e83a2f3..5f7ae16a3 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForProcessingExtension.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodeReservedForProcessingExtension.kt
@@ -55,7 +55,7 @@ class TSDeploymentTypeCodeReservedForProcessingExtension : AbstractCustomOnlyTSI
                 displayName,
                 XmlUpdateAttributeQuickFix(
                     Deployment.TYPE_CODE,
-                    TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                    TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
                 )
             )
         }
diff --git a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodesMustBeGreaterThanTenThousandForRelations.kt b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodesMustBeGreaterThanTenThousandForRelations.kt
index 55ebd1469..eb87a329b 100644
--- a/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodesMustBeGreaterThanTenThousandForRelations.kt
+++ b/src/com/intellij/idea/plugin/hybris/codeInspection/rule/typeSystem/TSDeploymentTypeCodesMustBeGreaterThanTenThousandForRelations.kt
@@ -54,7 +54,7 @@ class TSDeploymentTypeCodesMustBeGreaterThanTenThousandForRelations : AbstractCu
                 displayName,
                 XmlUpdateAttributeQuickFix(
                     Deployment.TYPE_CODE,
-                    TSMetaModelAccess.getInstance(project).getMetaModel().getNextAvailableTypeCode().toString()
+                    TSMetaModelAccess.getInstance(project).getNextAvailableTypeCode().toString()
                 )
             )
         }
diff --git a/src/com/intellij/idea/plugin/hybris/common/HybrisConstants.kt b/src/com/intellij/idea/plugin/hybris/common/HybrisConstants.kt
index a447d6da6..d28728b7e 100644
--- a/src/com/intellij/idea/plugin/hybris/common/HybrisConstants.kt
+++ b/src/com/intellij/idea/plugin/hybris/common/HybrisConstants.kt
@@ -236,6 +236,7 @@ object HybrisConstants {
     const val CLASS_ITEM_ROOT = "de.hybris.platform.core.model.ItemModel"
     const val CLASS_ENUM_ROOT = "de.hybris.platform.core.HybrisEnumValue"
     const val CLASS_INTERCEPTOR_MAPPING = "de.hybris.platform.servicelayer.interceptor.impl.InterceptorMapping"
+    const val CLASS_ANNOTATION_ACCESSOR = "de.hybris.bootstrap.annotations.Accessor"
     const val MODEL_SUFFIX = "Model"
     const val TYPECODE_FIELD_NAME = "_TYPECODE"
     const val SOURCE_ATTRIBUTE_NAME = "source"
diff --git a/src/com/intellij/idea/plugin/hybris/lang/annotation/TSAttributeHandlerGutterAnnotator.kt b/src/com/intellij/idea/plugin/hybris/lang/annotation/TSAttributeHandlerGutterAnnotator.kt
index 265debac4..88e7f3047 100644
--- a/src/com/intellij/idea/plugin/hybris/lang/annotation/TSAttributeHandlerGutterAnnotator.kt
+++ b/src/com/intellij/idea/plugin/hybris/lang/annotation/TSAttributeHandlerGutterAnnotator.kt
@@ -25,7 +25,7 @@ import com.intellij.idea.plugin.hybris.system.type.utils.TSUtils
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.openapi.editor.markup.GutterIconRenderer
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.psi.PsiElement
 import com.intellij.psi.xml.XmlAttribute
 import com.intellij.psi.xml.XmlAttributeValue
@@ -39,7 +39,7 @@ class TSAttributeHandlerGutterAnnotator : Annotator {
 
         val attribute = psiElement as XmlAttributeValue
         val project = psiElement.project
-        val module = ModuleUtil.findModuleForPsiElement(psiElement) ?: return
+        val module = ModuleUtilCore.findModuleForPsiElement(psiElement) ?: return
 
         val springBeans = SpringManager.getInstance(project).getAllModels(module)
             .mapNotNull { SpringModelSearchers.findBean(it, attribute.value) }
diff --git a/src/com/intellij/idea/plugin/hybris/lang/folding/ImpexMacroFoldingBuilder.java b/src/com/intellij/idea/plugin/hybris/lang/folding/ImpexMacroFoldingBuilder.java
index 9c1749a6a..866c544b6 100644
--- a/src/com/intellij/idea/plugin/hybris/lang/folding/ImpexMacroFoldingBuilder.java
+++ b/src/com/intellij/idea/plugin/hybris/lang/folding/ImpexMacroFoldingBuilder.java
@@ -37,7 +37,7 @@
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.psi.PsiElement;
@@ -227,7 +227,7 @@ private void resolveProperty(final ImpexMacroUsageDec macroUsage, final SmartLis
         ImpexMacroDescriptor descriptor = cache.get(text);
         if (descriptor == null) {
             final String propertyName = text.substring(HybrisConstants.IMPEX_CONFIG_COMPLETE_PREFIX.length());
-            final Module module = ModuleUtil.findModuleForPsiElement(macroUsage);
+            final Module module = ModuleUtilCore.findModuleForPsiElement(macroUsage);
             if (module == null) {
                 return;
             }
diff --git a/src/com/intellij/idea/plugin/hybris/psi/reference/SpringReference.kt b/src/com/intellij/idea/plugin/hybris/psi/reference/SpringReference.kt
index ed92d8e2d..d4848c48d 100644
--- a/src/com/intellij/idea/plugin/hybris/psi/reference/SpringReference.kt
+++ b/src/com/intellij/idea/plugin/hybris/psi/reference/SpringReference.kt
@@ -20,7 +20,7 @@ package com.intellij.idea.plugin.hybris.psi.reference
 
 import com.intellij.codeInsight.highlighting.HighlightedReference
 import com.intellij.idea.plugin.hybris.common.HybrisConstants
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.*
 import com.intellij.spring.SpringManager
@@ -35,7 +35,7 @@ class SpringReference(element: PsiElement) : PsiReferenceBase<PsiElement>(elemen
         val project = myElement.project
         val name = myElement.text.replace("[\"\']".toRegex(), StringUtils.EMPTY)
 
-        val module = ModuleUtil.findModuleForPsiElement(element) ?: return ResolveResult.EMPTY_ARRAY
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return ResolveResult.EMPTY_ARRAY
 
         return SpringManager.getInstance(project).getAllModels(module)
             .mapNotNull { SpringModelSearchers.findBean(it, name) }
diff --git a/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSGlobalMetaModel.kt b/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSGlobalMetaModel.kt
index 80352061c..d910b6a58 100644
--- a/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSGlobalMetaModel.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSGlobalMetaModel.kt
@@ -22,16 +22,21 @@ import com.intellij.idea.plugin.hybris.system.bean.meta.model.BSGlobalMetaEnum
 import com.intellij.idea.plugin.hybris.system.bean.meta.model.BSMetaType
 import com.intellij.idea.plugin.hybris.system.type.meta.impl.CaseInsensitive
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.util.ModificationTracker
 import com.intellij.util.xml.DomElement
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentMap
 
-class BSGlobalMetaModel : Disposable {
+class BSGlobalMetaModel : ModificationTracker, Disposable {
 
+    private var modificationTracker = Long.MIN_VALUE
     private val myMetaCache: MutableMap<BSMetaType, Map<String, BSGlobalMetaClassifier<out DomElement>>> = ConcurrentHashMap()
 
-    override fun dispose() {
-        myMetaCache.clear()
+    fun clear() {
+        cleanup()
+
+        if (modificationTracker == Long.MAX_VALUE) modificationTracker = 0L
+        modificationTracker++
     }
 
     @Suppress("UNCHECKED_CAST")
@@ -42,4 +47,11 @@ class BSGlobalMetaModel : Disposable {
 
     fun getMetaTypes() = myMetaCache;
 
+    override fun getModificationCount() = modificationTracker
+    override fun dispose() = cleanup()
+
+    private fun cleanup() {
+        myMetaCache.clear()
+    }
+
 }
diff --git a/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSMetaModelMerger.kt b/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSMetaModelMerger.kt
index ea2eb03bd..e2915807e 100644
--- a/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSMetaModelMerger.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/bean/meta/BSMetaModelMerger.kt
@@ -25,5 +25,5 @@ interface BSMetaModelMerger {
         fun getInstance(project: Project): BSMetaModelMerger = project.getService(BSMetaModelMerger::class.java)
     }
 
-    fun merge(localMetaModels: Collection<BSMetaModel>): BSGlobalMetaModel
+    fun merge(globalMetaModel: BSGlobalMetaModel, localMetaModels: Collection<BSMetaModel>)
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelAccessImpl.kt b/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelAccessImpl.kt
index 95494ad54..5c62f468c 100644
--- a/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelAccessImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelAccessImpl.kt
@@ -17,7 +17,6 @@
  */
 package com.intellij.idea.plugin.hybris.system.bean.meta.impl
 
-import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
 import com.intellij.idea.plugin.hybris.system.bean.meta.*
 import com.intellij.idea.plugin.hybris.system.bean.meta.model.BSGlobalMetaBean
@@ -26,7 +25,6 @@ import com.intellij.idea.plugin.hybris.system.bean.meta.model.BSGlobalMetaEnum
 import com.intellij.idea.plugin.hybris.system.bean.meta.model.BSMetaType
 import com.intellij.idea.plugin.hybris.system.bean.model.Bean
 import com.intellij.idea.plugin.hybris.system.bean.model.Enum
-import com.intellij.idea.plugin.hybris.system.type.meta.TSGlobalMetaModel
 import com.intellij.idea.plugin.hybris.system.type.meta.impl.TSMetaModelAccessImpl
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.progress.ProcessCanceledException
@@ -45,15 +43,17 @@ import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.util.messages.Topic
 import java.util.*
-import java.util.concurrent.locks.ReentrantReadWriteLock
+import java.util.concurrent.Semaphore
 
 class BSMetaModelAccessImpl(private val myProject: Project) : BSMetaModelAccess {
 
+    private val myGlobalMetaModel = BSGlobalMetaModel()
     private val myMessageBus = myProject.messageBus
     @Volatile
     private var building: Boolean = false
+    private val semaphore = Semaphore(1)
 
-    private val myGlobalMetaModel = CachedValuesManager.getManager(myProject).createCachedValue(
+    private val myGlobalMetaModelCache = CachedValuesManager.getManager(myProject).createCachedValue(
         {
             val localMetaModels = BSMetaModelCollector.getInstance(myProject).collectDependencies()
                 .filter { obj: PsiFile? -> Objects.nonNull(obj) }
@@ -64,29 +64,35 @@ class BSMetaModelAccessImpl(private val myProject: Project) : BSMetaModelAccess
             val dependencies = localMetaModels
                 .map { it.psiFile }
                 .toTypedArray()
-            val globalMetaModel = BSMetaModelMerger.getInstance(myProject).merge(localMetaModels)
+            BSMetaModelMerger.getInstance(myProject).merge(myGlobalMetaModel, localMetaModels)
 
-            CachedValueProvider.Result.create(globalMetaModel, dependencies.ifEmpty { ModificationTracker.EVER_CHANGED })
+            CachedValueProvider.Result.create(myGlobalMetaModel, dependencies.ifEmpty { ModificationTracker.EVER_CHANGED })
         }, false
     )
 
     override fun getMetaModel(): BSGlobalMetaModel {
         if (building || DumbService.isDumb(myProject)) throw ProcessCanceledException()
 
-        if (myGlobalMetaModel.hasUpToDateValue()) {
-            return myGlobalMetaModel.value
+        if (myGlobalMetaModelCache.hasUpToDateValue()) {
+            return myGlobalMetaModelCache.value
         }
 
         val task = object : Task.Backgroundable(myProject, message("hybris.bs.access.progress.title.building")) {
             override fun run(indicator: ProgressIndicator) {
                 DumbService.getInstance(project).runReadActionInSmartMode(
                     Computable {
-                        if (DumbService.isDumb(project)) throw ProcessCanceledException()
-
-                        building = true
-                        val globalMetaModel = myGlobalMetaModel.value
-                        building = false
-                        myMessageBus.syncPublisher(topic).beanSystemChanged(globalMetaModel)
+                        val lock = semaphore.tryAcquire()
+
+                        if (lock) {
+                            try {
+                                building = true
+                                val globalMetaModel = myGlobalMetaModelCache.value
+                                building = false
+                                myMessageBus.syncPublisher(topic).beanSystemChanged(globalMetaModel)
+                            } finally {
+                                semaphore.release();
+                            }
+                        }
                     }
                 )
             }
diff --git a/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelMergerImpl.kt b/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelMergerImpl.kt
index 0ed8aad77..268e63f98 100644
--- a/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelMergerImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/bean/meta/impl/BSMetaModelMergerImpl.kt
@@ -27,11 +27,12 @@ import com.intellij.idea.plugin.hybris.system.bean.meta.model.impl.BSGlobalMetaE
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
 import com.intellij.util.xml.DomElement
-import java.util.*
 
 class BSMetaModelMergerImpl(val myProject: Project) : BSMetaModelMerger {
 
-    override fun merge(localMetaModels: Collection<BSMetaModel>) = with(BSGlobalMetaModel()) {
+    override fun merge(globalMetaModel: BSGlobalMetaModel, localMetaModels: Collection<BSMetaModel>) = with(globalMetaModel) {
+        globalMetaModel.clear()
+
         ProgressManager.getInstance().progressIndicator.text2 = HybrisI18NBundleUtils.message("hybris.bs.access.progress.subTitle.merging")
 
         localMetaModels
@@ -45,7 +46,7 @@ class BSMetaModelMergerImpl(val myProject: Project) : BSMetaModelMerger {
         getMetaType<BSGlobalMetaBean>(BSMetaType.META_WS_BEAN).putAll(wsBeans)
         beans.keys.removeAll(wsBeans.keys)
 
-        this
+        Unit
     }
 
     @Suppress("UNCHECKED_CAST")
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngGlobalMetaModel.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngGlobalMetaModel.kt
index 94741d1a2..99b92c618 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngGlobalMetaModel.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngGlobalMetaModel.kt
@@ -22,12 +22,16 @@ import com.intellij.idea.plugin.hybris.system.cockpitng.meta.model.CngMetaEditor
 import com.intellij.idea.plugin.hybris.system.cockpitng.meta.model.CngMetaWidget
 import com.intellij.idea.plugin.hybris.system.cockpitng.meta.model.CngMetaWidgetDefinition
 import com.intellij.idea.plugin.hybris.system.type.meta.impl.CaseInsensitive.CaseInsensitiveConcurrentHashMap
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.util.ModificationTracker
 
 /**
- * Component can be any string, see https://help.sap.com/docs/SAP_COMMERCE/5c9ea0c629214e42b727bf08800d8dfa/8c75ec11866910149df9dfb10df17f03.html?locale=en-US&q=editorareaactions%20component#configuration-context
+ * Component can be any string
+ * @see <a href="https://help.sap.com/docs/SAP_COMMERCE/5c9ea0c629214e42b727bf08800d8dfa/8c75ec11866910149df9dfb10df17f03.html?locale=en-US&q=editorareaactions%20component#configuration-context">docs</a>
  */
-class CngGlobalMetaModel {
+class CngGlobalMetaModel : ModificationTracker, Disposable {
 
+    private var modificationTracker = Long.MIN_VALUE
     val components = mutableSetOf<String>()
     val contextAttributes = mutableMapOf<String, MutableSet<String>>()
     val actionDefinitions = CaseInsensitiveConcurrentHashMap<String, CngMetaActionDefinition>()
@@ -35,4 +39,23 @@ class CngGlobalMetaModel {
     val editorDefinitions = CaseInsensitiveConcurrentHashMap<String, CngMetaEditorDefinition>()
     val widgets = CaseInsensitiveConcurrentHashMap<String, CngMetaWidget>()
 
+    fun clear() {
+        cleanup()
+
+        if (modificationTracker == Long.MAX_VALUE) modificationTracker = 0L
+        modificationTracker++
+    }
+
+    override fun getModificationCount() = modificationTracker
+    override fun dispose() = cleanup()
+
+    private fun cleanup() {
+        components.clear()
+        contextAttributes.clear()
+        actionDefinitions.clear()
+        widgetDefinitions.clear()
+        editorDefinitions.clear()
+        widgets.clear()
+    }
+
 }
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngMetaModelMerger.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngMetaModelMerger.kt
index 3de0077d7..fcbb15427 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngMetaModelMerger.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/CngMetaModelMerger.kt
@@ -27,10 +27,11 @@ interface CngMetaModelMerger {
     }
 
     fun merge(
+        globalMetaModel: CngGlobalMetaModel,
         configs: Collection<CngConfigMeta>,
         actions: Collection<CngMetaActionDefinition>,
         widgetDefinitions: Collection<CngMetaWidgetDefinition>,
         editors: Collection<CngMetaEditorDefinition>,
         widgets: Collection<CngMetaWidgets>
-    ): CngGlobalMetaModel
+    )
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelAccessImpl.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelAccessImpl.kt
index 413d5f7ff..3ea2195e5 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelAccessImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelAccessImpl.kt
@@ -25,7 +25,6 @@ import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.ActionDefinit
 import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.EditorDefinition
 import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.WidgetDefinition
 import com.intellij.idea.plugin.hybris.system.cockpitng.model.core.Widgets
-import com.intellij.idea.plugin.hybris.system.type.meta.impl.TSMetaModelAccessImpl
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.progress.ProgressIndicator
@@ -45,7 +44,7 @@ import com.intellij.util.messages.Topic
 import com.intellij.util.xml.DomElement
 import com.intellij.util.xml.DomFileElement
 import java.util.*
-import java.util.concurrent.locks.ReentrantReadWriteLock
+import java.util.concurrent.Semaphore
 
 /**
  * Global Meta Model can be retrieved at any time and will ensure that only single Thread can perform its initialization/update
@@ -62,11 +61,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock
  */
 class CngMetaModelAccessImpl(private val myProject: Project) : CngMetaModelAccess {
 
+    private val myGlobalMetaModel = CngGlobalMetaModel()
     private val myMessageBus = myProject.messageBus
     @Volatile
     private var building: Boolean = false
+    private val semaphore = Semaphore(1)
 
-    private val myGlobalMetaModel = CachedValuesManager.getManager(myProject).createCachedValue(
+    private val myGlobalMetaModelCache = CachedValuesManager.getManager(myProject).createCachedValue(
         {
             val processor = CngMetaModelProcessor.getInstance(myProject)
             val (configs, configDependencies) = collectLocalMetaModels(SINGLE_CONFIG_CACHE_KEY, Config::class.java,
@@ -89,13 +90,13 @@ class CngMetaModelAccessImpl(private val myProject: Project) : CngMetaModelAcces
                 { file -> processor.processWidgets(file) },
                 { _ -> true }
             )
-            val globalMetaModel = CngMetaModelMerger.getInstance(myProject).merge(
-                configs, actions, widgetDefinitions, editors, widgets
+            CngMetaModelMerger.getInstance(myProject).merge(
+                myGlobalMetaModel, configs, actions, widgetDefinitions, editors, widgets
             )
 
             val dependencies = configDependencies + actionDependencies + widgetDependencies + editorDependencies + widgetsDependencies
 
-            CachedValueProvider.Result.create(globalMetaModel, dependencies.ifEmpty { ModificationTracker.EVER_CHANGED })
+            CachedValueProvider.Result.create(myGlobalMetaModel, dependencies.ifEmpty { ModificationTracker.EVER_CHANGED })
         }, false
     )
 
@@ -119,20 +120,26 @@ class CngMetaModelAccessImpl(private val myProject: Project) : CngMetaModelAcces
     override fun getMetaModel(): CngGlobalMetaModel {
         if (building || DumbService.isDumb(myProject)) throw ProcessCanceledException()
 
-        if (myGlobalMetaModel.hasUpToDateValue()) {
-            return myGlobalMetaModel.value
+        if (myGlobalMetaModelCache.hasUpToDateValue()) {
+            return myGlobalMetaModelCache.value
         }
 
         val task = object : Task.Backgroundable(myProject, HybrisI18NBundleUtils.message("hybris.cng.access.progress.title.building")) {
             override fun run(indicator: ProgressIndicator) {
                 DumbService.getInstance(project).runReadActionInSmartMode(
                     Computable {
-                        if (DumbService.isDumb(project)) throw ProcessCanceledException()
-
-                        building = true
-                        val globalMetaModel = myGlobalMetaModel.value
-                        building = false
-                        myMessageBus.syncPublisher(topic).cngSystemChanged(globalMetaModel)
+                        val lock = semaphore.tryAcquire()
+
+                        if (lock) {
+                            try {
+                                building = true
+                                val globalMetaModel = myGlobalMetaModelCache.value
+                                building = false
+                                myMessageBus.syncPublisher(topic).cngSystemChanged(globalMetaModel)
+                            } finally {
+                                semaphore.release();
+                            }
+                        }
                     }
                 )
             }
diff --git a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelMergerImpl.kt b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelMergerImpl.kt
index 5562a1026..1ebfb5fe5 100644
--- a/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelMergerImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/cockpitng/meta/impl/CngMetaModelMergerImpl.kt
@@ -17,7 +17,6 @@
  */
 package com.intellij.idea.plugin.hybris.system.cockpitng.meta.impl
 
-import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
 import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngGlobalMetaModel
 import com.intellij.idea.plugin.hybris.system.cockpitng.meta.CngMetaModelMerger
@@ -28,12 +27,15 @@ import com.intellij.openapi.project.Project
 class CngMetaModelMergerImpl(val myProject: Project) : CngMetaModelMerger {
 
     override fun merge(
+        globalMetaModel: CngGlobalMetaModel,
         configs: Collection<CngConfigMeta>,
         actions: Collection<CngMetaActionDefinition>,
         widgetDefinitions: Collection<CngMetaWidgetDefinition>,
         editors: Collection<CngMetaEditorDefinition>,
         widgets: Collection<CngMetaWidgets>
-    ) = with(CngGlobalMetaModel()) {
+    ) = with(globalMetaModel) {
+        globalMetaModel.clear()
+
         ProgressManager.getInstance().progressIndicator.text2 = message("hybris.cng.access.progress.subTitle.merging")
 
         configs
@@ -46,7 +48,6 @@ class CngMetaModelMergerImpl(val myProject: Project) : CngMetaModelMerger {
             .forEach { merge(this, it) }
         widgets
             .forEach { merge(this, it) }
-        this
     }
 
     private fun merge(globalMetaModel: CngGlobalMetaModel, localMeta: CngConfigMeta) {
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/converter/AttributeHandlerReferenceConverter.kt b/src/com/intellij/idea/plugin/hybris/system/type/converter/AttributeHandlerReferenceConverter.kt
index 838e4cbd3..4d5a49636 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/converter/AttributeHandlerReferenceConverter.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/converter/AttributeHandlerReferenceConverter.kt
@@ -22,22 +22,20 @@ import com.intellij.idea.plugin.hybris.project.utils.PluginCommon.SPRING_PLUGIN_
 import com.intellij.idea.plugin.hybris.project.utils.PluginCommon.isPluginActive
 import com.intellij.idea.plugin.hybris.system.type.psi.reference.PlainXmlReference
 import com.intellij.idea.plugin.hybris.system.type.psi.reference.SpringReference
-import com.intellij.psi.*
+import com.intellij.psi.PsiDocCommentOwner
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiReference
+import com.intellij.psi.ResolvingHint
 import com.intellij.util.xml.ConvertContext
 import com.intellij.util.xml.CustomReferenceConverter
 import com.intellij.util.xml.GenericDomValue
 
 class AttributeHandlerReferenceConverter : CustomReferenceConverter<String>, ResolvingHint {
 
-    override fun createReferences(value: GenericDomValue<String>, element: PsiElement, context: ConvertContext): Array<PsiReference>
-            = if (isPluginActive(SPRING_PLUGIN_ID)) createSpringReferences(element, value) else createPlainXMLReference(element, value)
-
-    private fun createPlainXMLReference(element: PsiElement, value: GenericDomValue<String>): Array<PsiReference> = arrayOf(PlainXmlReference(element, value))
-
-    private fun createSpringReferences(element: PsiElement, value: GenericDomValue<String>): Array<PsiReference> {
-        val name = value.stringValue!!.trim()
-
-        return arrayOf(SpringReference(element, name))
+    override fun createReferences(value: GenericDomValue<String>, element: PsiElement, context: ConvertContext): Array<PsiReference> = if (isPluginActive(SPRING_PLUGIN_ID)) {
+        arrayOf(SpringReference(element, value.stringValue!!.trim()))
+    } else {
+        arrayOf(PlainXmlReference(element, value))
     }
 
     override fun canResolveTo(elementClass: Class<out PsiElement>) = !PsiDocCommentOwner::class.java.isAssignableFrom(elementClass)
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/meta/TSGlobalMetaModel.kt b/src/com/intellij/idea/plugin/hybris/system/type/meta/TSGlobalMetaModel.kt
index 9fe834602..bf2678c6b 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/meta/TSGlobalMetaModel.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/meta/TSGlobalMetaModel.kt
@@ -17,39 +17,32 @@
  */
 package com.intellij.idea.plugin.hybris.system.type.meta
 
-import com.intellij.idea.plugin.hybris.common.HybrisConstants
 import com.intellij.idea.plugin.hybris.system.type.meta.impl.CaseInsensitive
 import com.intellij.idea.plugin.hybris.system.type.meta.model.*
 import com.intellij.openapi.Disposable
+import com.intellij.openapi.util.ModificationTracker
 import com.intellij.util.xml.DomElement
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentMap
 
-class TSGlobalMetaModel : Disposable {
+class TSGlobalMetaModel : ModificationTracker, Disposable {
 
+    private var modificationTracker = Long.MIN_VALUE
     private val myMetaCache: MutableMap<TSMetaType, Map<String, TSGlobalMetaClassifier<out DomElement>>> = ConcurrentHashMap()
     private val myReferencesBySourceTypeName = CaseInsensitive.NoCaseMultiMap<TSMetaRelation.TSMetaRelationElement>()
     private val myDeploymentTables = CaseInsensitive.CaseInsensitiveConcurrentHashMap<String, TSMetaDeployment>();
     private val myDeploymentTypeCodes = ConcurrentHashMap<Int, TSMetaDeployment>();
 
-    override fun dispose() {
-        myMetaCache.clear()
-        myReferencesBySourceTypeName.clear()
-        myDeploymentTables.clear()
+    fun clear() {
+        cleanup()
+
+        if (modificationTracker == Long.MAX_VALUE) modificationTracker = 0L
+        modificationTracker++
     }
 
-    fun getDeploymentForTable(table: String?) : TSMetaDeployment? = if (table != null) myDeploymentTables[table] else null
-    fun getDeploymentForTypeCode(typeCode: Int?) : TSMetaDeployment? = if (typeCode != null) myDeploymentTypeCodes[typeCode] else null
-    fun getDeploymentForTypeCode(typeCode: String?) : TSMetaDeployment? = getDeploymentForTypeCode(typeCode?.toIntOrNull())
-    fun getNextAvailableTypeCode(): Int = myDeploymentTypeCodes.keys
-        .asSequence()
-        .filter { it < HybrisConstants.TS_TYPECODE_RANGE_PROCESSING.first }
-        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_B2BCOMMERCE }
-        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_COMMONS }
-        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_XPRINT }
-        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_PRINT }
-        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_PROCESSING }
-        .maxOf { it } + 1
+    fun getDeploymentForTable(table: String?): TSMetaDeployment? = if (table != null) myDeploymentTables[table] else null
+    fun getDeploymentForTypeCode(typeCode: Int?): TSMetaDeployment? = if (typeCode != null) myDeploymentTypeCodes[typeCode] else null
+    fun getDeploymentForTypeCode(typeCode: String?): TSMetaDeployment? = getDeploymentForTypeCode(typeCode?.toIntOrNull())
 
     @Suppress("UNCHECKED_CAST")
     fun <T : TSGlobalMetaClassifier<*>> getMetaType(metaType: TSMetaType): ConcurrentMap<String, T> =
@@ -67,6 +60,7 @@ class TSGlobalMetaModel : Disposable {
     fun getRelations(name: String?): Collection<TSMetaRelation.TSMetaRelationElement>? = name?.let { getAllRelations()[it] }
 
     fun getAllRelations() = myReferencesBySourceTypeName;
+    fun getDeploymentTypeCodes() = myDeploymentTypeCodes
 
     fun addDeployment(deployment: TSMetaDeployment) {
         myDeploymentTables[deployment.table] = deployment
@@ -76,4 +70,14 @@ class TSGlobalMetaModel : Disposable {
         }
     }
 
+    override fun getModificationCount() = modificationTracker
+    override fun dispose() = cleanup()
+
+    @Synchronized
+    private fun cleanup() {
+        myMetaCache.clear()
+        myReferencesBySourceTypeName.clear()
+        myDeploymentTables.clear()
+        myDeploymentTypeCodes.clear()
+    }
 }
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelAccess.kt b/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelAccess.kt
index 99aae4937..94784edd5 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelAccess.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelAccess.kt
@@ -41,5 +41,5 @@ interface TSMetaModelAccess {
     fun findMetaForDom(dom: ItemType): TSGlobalMetaItem?
     fun findMetaForDom(dom: EnumType): TSGlobalMetaEnum?
     fun <T : TSGlobalMetaClassifier<*>> getAll(metaType: TSMetaType): Collection<T>
-
+    fun getNextAvailableTypeCode(): Int
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelMerger.kt b/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelMerger.kt
index 904a3b225..d1aeccdbd 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelMerger.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/meta/TSMetaModelMerger.kt
@@ -25,5 +25,5 @@ interface TSMetaModelMerger {
         fun getInstance(project: Project): TSMetaModelMerger = project.getService(TSMetaModelMerger::class.java)
     }
 
-    fun merge(localMetaModels: Collection<TSMetaModel>): TSGlobalMetaModel
+    fun merge(globalMetaModel: TSGlobalMetaModel, localMetaModels: Collection<TSMetaModel>)
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/CaseInsensitive.java b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/CaseInsensitive.java
index 08124b8fa..1621eadce 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/CaseInsensitive.java
+++ b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/CaseInsensitive.java
@@ -18,47 +18,57 @@
 
 package com.intellij.idea.plugin.hybris.system.type.meta.impl;
 
-import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.Serial;
-import java.util.Collection;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
-public class CaseInsensitive {
+public final class CaseInsensitive {
 
-    @NotNull
-    public static String eraseCase(final @NotNull String key) {
-        return key.toLowerCase();
+    private CaseInsensitive() {
     }
 
     public static class NoCaseMultiMap<V> {
 
-        private final MultiMap<String, V> myMultiMap = MultiMap.createLinked();
+        private final CaseInsensitiveConcurrentHashMap<String, Collection<V>> myMap = new CaseInsensitiveConcurrentHashMap<>();
 
         public void putValue(final @NotNull String key, final @NotNull V value) {
-            myMultiMap.putValue(eraseCase(key), value);
+            myMap
+                .computeIfAbsent(key, s -> new LinkedList<>())
+                .add(value);
+        }
+
+        public Set<Map.Entry<String, Collection<V>>> entrySet() {
+            return myMap.entrySet();
         }
 
         @NotNull
         public Collection<V> values() {
-            return myMultiMap.values();
+            return myMap.values().parallelStream()
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
         }
 
         public void putAllValues(@NotNull final NoCaseMultiMap<V> map) {
-            myMultiMap.putAllValues(map.myMultiMap);
+            map.entrySet().forEach(entry ->
+                myMap
+                    .computeIfAbsent(entry.getKey(), s -> new LinkedList<>())
+                    .addAll(entry.getValue())
+            );
         }
 
-        @NotNull
+        @Nullable
         public Collection<V> get(final @NotNull String key) {
-            return myMultiMap.get(eraseCase(key));
+            return myMap.get(key);
         }
 
         public void clear() {
-            myMultiMap.clear();
+            myMap.clear();
         }
 
     }
@@ -115,6 +125,4 @@ protected <T> T convertKey(final Object key) {
         }
     }
 
-
 }
-
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt
index 10b19553c..d3c8b6d38 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelAccessImpl.kt
@@ -17,6 +17,7 @@
  */
 package com.intellij.idea.plugin.hybris.system.type.meta.impl
 
+import com.intellij.idea.plugin.hybris.common.HybrisConstants
 import com.intellij.idea.plugin.hybris.common.utils.CollectionUtils
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
 import com.intellij.idea.plugin.hybris.system.type.meta.*
@@ -41,6 +42,7 @@ import com.intellij.psi.util.CachedValuesManager
 import com.intellij.util.messages.Topic
 import com.intellij.util.xml.DomElement
 import java.util.*
+import java.util.concurrent.Semaphore
 
 /**
  * Global Meta Model can be retrieved at any time and will ensure that only single Thread can perform its initialization/update
@@ -57,11 +59,13 @@ import java.util.*
  */
 class TSMetaModelAccessImpl(private val myProject: Project) : TSMetaModelAccess {
 
+    private val myGlobalMetaModel = TSGlobalMetaModel()
     private val myMessageBus = myProject.messageBus
     @Volatile
     private var building: Boolean = false
+    private val semaphore = Semaphore(1)
 
-    private val myGlobalMetaModel = CachedValuesManager.getManager(myProject).createCachedValue(
+    private val myGlobalMetaModelCache = CachedValuesManager.getManager(myProject).createCachedValue(
         {
             val localMetaModels = TSMetaModelCollector.getInstance(myProject).collectDependencies()
                 .filter { obj: PsiFile? -> Objects.nonNull(obj) }
@@ -72,17 +76,18 @@ class TSMetaModelAccessImpl(private val myProject: Project) : TSMetaModelAccess
             val dependencies = localMetaModels
                 .map { it.psiFile }
                 .toTypedArray()
-            val globalMetaModel = TSMetaModelMerger.getInstance(myProject).merge(localMetaModels)
 
-            CachedValueProvider.Result.create(globalMetaModel, dependencies.ifEmpty { ModificationTracker.EVER_CHANGED })
+            TSMetaModelMerger.getInstance(myProject).merge(myGlobalMetaModel, localMetaModels)
+
+            CachedValueProvider.Result.create(myGlobalMetaModel, dependencies.ifEmpty { ModificationTracker.EVER_CHANGED })
         }, false
     )
 
     override fun getMetaModel(): TSGlobalMetaModel {
         if (building || DumbService.isDumb(myProject)) throw ProcessCanceledException()
 
-        if (myGlobalMetaModel.hasUpToDateValue()) {
-            return myGlobalMetaModel.value
+        if (myGlobalMetaModelCache.hasUpToDateValue()) {
+            return myGlobalMetaModelCache.value
         }
 
         val task = object : Task.Backgroundable(myProject, message("hybris.ts.access.progress.title.building")) {
@@ -90,11 +95,18 @@ class TSMetaModelAccessImpl(private val myProject: Project) : TSMetaModelAccess
                 DumbService.getInstance(project).runReadActionInSmartMode(
                         Computable {
                             if (DumbService.isDumb(project)) throw ProcessCanceledException()
-
-                            building = true
-                            val globalMetaModel = myGlobalMetaModel.value
-                            building = false
-                            myMessageBus.syncPublisher(topic).typeSystemChanged(globalMetaModel)
+                            val lock = semaphore.tryAcquire()
+
+                            if (lock) {
+                                try {
+                                    building = true
+                                    val globalMetaModel = myGlobalMetaModelCache.value
+                                    building = false
+                                    myMessageBus.syncPublisher(topic).typeSystemChanged(globalMetaModel)
+                                } finally {
+                                    semaphore.release();
+                                }
+                            }
                         }
                 )
             }
@@ -130,6 +142,16 @@ class TSMetaModelAccessImpl(private val myProject: Project) : TSMetaModelAccess
         return result
     }
 
+    override fun getNextAvailableTypeCode(): Int = getMetaModel().getDeploymentTypeCodes().keys
+        .asSequence()
+        .filter { it < HybrisConstants.TS_TYPECODE_RANGE_PROCESSING.first }
+        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_B2BCOMMERCE }
+        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_COMMONS }
+        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_XPRINT }
+        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_PRINT }
+        .filter { it !in HybrisConstants.TS_TYPECODE_RANGE_PROCESSING }
+        .maxOf { it } + 1
+
     private fun <T : TSGlobalMetaClassifier<*>> findMetaByName(metaType: TSMetaType, name: String?): T? =
         getMetaModel().getMetaType<T>(metaType)[name]
 
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelMergerImpl.kt b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelMergerImpl.kt
index dee3d15ab..128f7d086 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelMergerImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/meta/impl/TSMetaModelMergerImpl.kt
@@ -27,7 +27,9 @@ import com.intellij.util.xml.DomElement
 
 class TSMetaModelMergerImpl(val myProject: Project) : TSMetaModelMerger {
 
-    override fun merge(localMetaModels: Collection<TSMetaModel>) = with(TSGlobalMetaModel()) {
+    override fun merge(globalMetaModel: TSGlobalMetaModel, localMetaModels: Collection<TSMetaModel>) = with(globalMetaModel) {
+        globalMetaModel.clear()
+
         ProgressManager.getInstance().progressIndicator.text2 = message("hybris.ts.access.progress.subTitle.merging")
 
         localMetaModels
@@ -54,8 +56,6 @@ class TSMetaModelMergerImpl(val myProject: Project) : TSMetaModelMerger {
         getMetaType<TSGlobalMetaItem>(TSMetaType.META_ITEM).values
             .flatMap { it.allRelationEnds }
             .forEach { it.flattenType = TSMetaHelper.flattenType(TSMetaHelper.flattenType(it), allTypes) }
-
-        this
     }
 
     @Suppress("UNCHECKED_CAST")
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/PlainXmlReference.kt b/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/PlainXmlReference.kt
index 5818c296c..94bbad937 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/PlainXmlReference.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/PlainXmlReference.kt
@@ -20,8 +20,7 @@ package com.intellij.idea.plugin.hybris.system.type.psi.reference
 
 import com.intellij.ide.highlighter.XmlFileType
 import com.intellij.idea.plugin.hybris.common.HybrisConstants
-import com.intellij.idea.plugin.hybris.impex.utils.CommonPsiUtils
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.*
@@ -41,7 +40,7 @@ class PlainXmlReference(
 
     override fun multiResolve(incompleteCode: Boolean): Array<ResolveResult> {
         val psiSearchHelper = PsiSearchHelper.getInstance(project)
-        val module = ModuleUtil.findModuleForPsiElement(element) ?: return ResolveResult.EMPTY_ARRAY
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return ResolveResult.EMPTY_ARRAY
         val searchText = value.stringValue?.trim() ?: return ResolveResult.EMPTY_ARRAY
         val foundEls = mutableListOf<PsiElement>()
 
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/SpringReference.kt b/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/SpringReference.kt
index 97bde5470..ad8bf33b0 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/SpringReference.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/psi/reference/SpringReference.kt
@@ -19,7 +19,7 @@
 package com.intellij.idea.plugin.hybris.system.type.psi.reference
 
 import com.intellij.idea.plugin.hybris.common.HybrisConstants
-import com.intellij.openapi.module.ModuleUtil
+import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.*
@@ -36,7 +36,7 @@ class SpringReference(
     override fun getRangeInElement() = TextRange.from(1, element.textLength - HybrisConstants.QUOTE_LENGTH)
 
     override fun multiResolve(incompleteCode: Boolean): Array<ResolveResult> {
-        val module = ModuleUtil.findModuleForPsiElement(element) ?: return ResolveResult.EMPTY_ARRAY
+        val module = ModuleUtilCore.findModuleForPsiElement(element) ?: return ResolveResult.EMPTY_ARRAY
 
         val springModels = SpringManager.getInstance(project).getAllModels(module)
         val pointer = findBean(springModels, name) ?: return ResolveResult.EMPTY_ARRAY