diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index df03c22ed87c..7f7f0d7dd7ae 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -1,13 +1,21 @@
 <idea-plugin>
   <extensionPoints>
-    <extensionPoint name="errorOptionsProvider" beanClass="com.intellij.profile.codeInspection.ui.ErrorOptionsProviderEP"/>
-    <extensionPoint name="codeFoldingOptionsProvider" beanClass="com.intellij.application.options.editor.CodeFoldingOptionsProviderEP"/>
-    <extensionPoint name="autoImportOptionsProvider" beanClass="com.intellij.application.options.editor.AutoImportOptionsProviderEP"/>
+    <extensionPoint name="errorOptionsProvider" beanClass="com.intellij.profile.codeInspection.ui.ErrorOptionsProviderEP">
+      <with attribute="instance" implements="com.intellij.profile.codeInspection.ui.ErrorOptionsProvider"/>
+    </extensionPoint>
+    <extensionPoint name="codeFoldingOptionsProvider" beanClass="com.intellij.application.options.editor.CodeFoldingOptionsProviderEP">
+      <with attribute="instance" implements="com.intellij.application.options.editor.CodeFoldingOptionsProvider"/>
+    </extensionPoint>
+    <extensionPoint name="autoImportOptionsProvider" beanClass="com.intellij.application.options.editor.AutoImportOptionsProviderEP">
+      <with attribute="instance" implements="com.intellij.application.options.editor.AutoImportOptionsProvider"/>
+    </extensionPoint>
     <extensionPoint name="moduleService" beanClass="com.intellij.openapi.components.ServiceDescriptor"/>
 
     <extensionPoint name="moduleConfigurable"
                     beanClass="com.intellij.openapi.options.ModuleConfigurableEP"
-                    area="IDEA_MODULE"/>
+                    area="IDEA_MODULE">
+      <with attribute="instance" implements="com.intellij.openapi.roots.ui.configuration.projectRoot.ModuleConfigurable"/>
+    </extensionPoint>
 
     <extensionPoint name="indexPatternProvider"
                     interface="com.intellij.psi.search.IndexPatternProvider"/>
@@ -34,14 +42,18 @@
 
 
     <extensionPoint name="intentionAction"
-                    beanClass="com.intellij.codeInsight.intention.IntentionActionBean"/>
+                    beanClass="com.intellij.codeInsight.intention.IntentionActionBean">
+      <with attribute="className" implements="com.intellij.codeInsight.intention.IntentionAction"/>
+    </extensionPoint>
 
     <extensionPoint name="codeInsight.unresolvedReferenceQuickFixProvider"
                     interface="com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider"/>
 
 
     <extensionPoint name="braceMatcher"
-                    beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
+                    beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.highlighting.BraceMatcher"/>
+    </extensionPoint>
     <extensionPoint name="quoteHandler"
                     beanClass="com.intellij.codeInsight.editorActions.QuoteHandlerEP"/>
     <extensionPoint name="extendWordSelectionHandler"
@@ -93,56 +105,125 @@
                     area="IDEA_PROJECT"/>
 
     <extensionPoint name="annotator"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.annotation.Annotator"/>
+    </extensionPoint>
+
     <extensionPoint name="externalAnnotator"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.annotation.ExternalAnnotator"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.refactoringSupport"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.refactoring.RefactoringSupportProvider"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.refactoringSupport.classMembersRefactoringSupport"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.classMembers.ClassMembersRefactoringSupport"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.documentationProvider"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.documentation.DocumentationProvider"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.namesValidator"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.refactoring.NamesValidator"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.findUsagesProvider"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.findUsages.FindUsagesProvider"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.commenter"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.Commenter"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.literalEscaper"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.LiteralEscaper"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.braceMatcher"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.PairedBraceMatcher"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.foldingBuilder"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.folding.FoldingBuilder"/>
+    </extensionPoint>
+
     <extensionPoint name="customFoldingProvider"
                     interface="com.intellij.lang.folding.CustomFoldingProvider"/>
     <extensionPoint name="lang.psiStructureViewFactory"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.PsiStructureViewFactory"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.structureViewExtension"
                     interface="com.intellij.ide.structureView.StructureViewExtension"/>
+
     <extensionPoint name="lang.ast.factory"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.ASTFactory"/>
+    </extensionPoint>
+
+    <extensionPoint name="lang.formatter" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.formatting.FormattingModelBuilder"/>
+    </extensionPoint>
 
-    <extensionPoint name="lang.formatter" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
     <extensionPoint name="lang.formatter.restriction" interface="com.intellij.lang.LanguageFormattingRestriction"/>
-    <extensionPoint name="lang.importOptimizer" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="lang.importOptimizer" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.ImportOptimizer"/>
+    </extensionPoint>
 
-    <extensionPoint name="lang.rearranger" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="lang.surroundDescriptor" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="lang.unwrapDescriptor" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="lang.parserDefinition" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="lang.treePatcher" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="lang.tokenSeparatorGenerator" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="lang.rearranger" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.codeStyle.arrangement.Rearranger"/>
+    </extensionPoint>
+
+    <extensionPoint name="lang.surroundDescriptor" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.surroundWith.SurroundDescriptor"/>
+    </extensionPoint>
+
+    <extensionPoint name="lang.unwrapDescriptor" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.unwrap.UnwrapDescriptor"/>
+    </extensionPoint>
+
+    <extensionPoint name="lang.parserDefinition" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.ParserDefinition"/>
+    </extensionPoint>
+
+    <extensionPoint name="lang.treePatcher" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.templateLanguages.TreePatcher"/>
+    </extensionPoint>
+
+    <extensionPoint name="lang.tokenSeparatorGenerator" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.TokenSeparatorGenerator"/>
+    </extensionPoint>
 
     <extensionPoint name="lang.psiAugmentProvider" interface="com.intellij.psi.augment.PsiAugmentProvider"/>
 
-    <extensionPoint name="lang.fileViewProviderFactory" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="fileType.fileViewProviderFactory" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
+    <extensionPoint name="lang.fileViewProviderFactory" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.FileViewProviderFactory"/>
+    </extensionPoint>
+
+    <extensionPoint name="fileType.fileViewProviderFactory" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.FileViewProviderFactory"/>
+    </extensionPoint>
+
     <extensionPoint name="multiLangCommenter"
                     interface="com.intellij.psi.templateLanguages.MultipleLangCommentProvider"/>
 
     <extensionPoint name="cacheBuilder"
-                    beanClass="com.intellij.lang.cacheBuilder.CacheBuilderEP"/>
+                    beanClass="com.intellij.lang.cacheBuilder.CacheBuilderEP">
+      <with attribute="wordsScannerClass" implements="com.intellij.lang.cacheBuilder.WordsScanner"/>
+    </extensionPoint>
 
     <extensionPoint name="referencesSearch" interface="com.intellij.util.QueryExecutor"/>
     <extensionPoint name="definitionsSearch" interface="com.intellij.util.QueryExecutor"/>
@@ -176,7 +257,10 @@
     <extensionPoint name="preFormatProcessor" interface="com.intellij.psi.impl.source.codeStyle.PreFormatProcessor"/>
     <extensionPoint name="postFormatProcessor" interface="com.intellij.psi.impl.source.codeStyle.PostFormatProcessor"/>
 
-    <extensionPoint name="declarationRangeHandler" beanClass="com.intellij.util.MixinEP"/>
+    <extensionPoint name="declarationRangeHandler" beanClass="com.intellij.util.MixinEP">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.hint.DeclarationRangeHandler"/>
+    </extensionPoint>
+
     <extensionPoint name="highlightUsagesHandlerFactory" interface="com.intellij.codeInsight.highlighting.HighlightUsagesHandlerFactory"/>
 
     <extensionPoint name="usageTargetProvider"
@@ -191,9 +275,14 @@
     <extensionPoint name="patternDialectProvider" interface="com.intellij.packageDependencies.ui.PatternDialectProvider"/>
 
     <extensionPoint name="localInspection"
-                    beanClass="com.intellij.codeInspection.LocalInspectionEP"/>
+                    beanClass="com.intellij.codeInspection.LocalInspectionEP">
+      <with attribute="implementationClass" implements="com.intellij.codeInspection.LocalInspectionTool"/>
+    </extensionPoint>
+
     <extensionPoint name="globalInspection"
-                    beanClass="com.intellij.codeInspection.InspectionEP"/>
+                    beanClass="com.intellij.codeInspection.InspectionEP">
+      <with attribute="implementationClass" implements="com.intellij.codeInspection.GlobalInspectionTool"/>
+    </extensionPoint>
     <!-- please use localInspection or globalInspection instead-->
     <extensionPoint name="specialTool"
                     beanClass="com.intellij.codeInspection.InspectionEP"/>
@@ -239,7 +328,9 @@
                     interface="com.intellij.ide.favoritesTreeView.FavoritesListProvider"
                     area="IDEA_PROJECT"/>
 
-    <extensionPoint name="lang.emacs" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="lang.emacs" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.editorActions.emacs.EmacsProcessingHandler"/>
+    </extensionPoint>
 
     <!-- File-Based Index-->
     <extensionPoint name="fileBasedIndex" interface="com.intellij.util.indexing.FileBasedIndexExtension"/>
@@ -251,25 +342,28 @@
     <extensionPoint name="refactoring.moveHandler" interface="com.intellij.refactoring.move.MoveHandlerDelegate"/>
     <extensionPoint name="refactoring.moveDirectoryWithClassesHelper"
                     interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesHelper"/>
-    <extensionPoint name="refactoring.moveClassHandler" interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler"/>
-    <extensionPoint name="refactoring.moveAllClassesInFileHandler"
-                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveAllClassesInFileHandler"/>
-    <extensionPoint name="refactoring.moveClassToInnerHandler"
-                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerHandler"/>
-    <extensionPoint name="refactoring.moveMemberHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="refactoring.moveInnerHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+
     <extensionPoint name="refactoring.helper" interface="com.intellij.refactoring.RefactoringHelper"/>
-    <extensionPoint name="refactoring.inlineHandler" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="refactoring.inlineHandler" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.refactoring.InlineHandler"/>
+    </extensionPoint>
+
     <extensionPoint name="refactoring.safeDeleteProcessor" interface="com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate"/>
+
     <extensionPoint name="refactoring.extractIncludeHandler"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.RefactoringActionHandler"/>
+    </extensionPoint>
+
     <extensionPoint name="refactoring.changeSignatureUsageProcessor"
                     interface="com.intellij.refactoring.changeSignature.ChangeSignatureUsageProcessor"/>
 
     <extensionPoint name="elementDescriptionProvider" interface="com.intellij.psi.ElementDescriptionProvider"/>
 
     <extensionPoint name="structureViewBuilder"
-                    beanClass="com.intellij.openapi.extensions.KeyedFactoryEPBean"/>
+                    beanClass="com.intellij.openapi.extensions.KeyedFactoryEPBean">
+      <with attribute="implementationClass" implements="com.intellij.ide.structureView.StructureViewBuilder"/>
+    </extensionPoint>
 
     <extensionPoint name="macro" interface="com.intellij.ide.macro.Macro"/>
     <extensionPoint name="printOption" interface="com.intellij.codeEditor.printing.PrintOption"/>
@@ -311,22 +405,41 @@
                     area="IDEA_PROJECT"/>
     <extensionPoint name="scopeTreeExpander" interface="com.intellij.ide.scopeView.ScopeTreeStructureExpander" area="IDEA_PROJECT"/>
 
-    <extensionPoint name="lang.elementManipulator" beanClass="com.intellij.openapi.util.ClassExtensionPoint"/>
+    <extensionPoint name="lang.elementManipulator" beanClass="com.intellij.openapi.util.ClassExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.ElementManipulator"/>
+    </extensionPoint>
+
     <extensionPoint name="fileContextProvider" interface="com.intellij.psi.FileContextProvider" area="IDEA_PROJECT"/>
     <extensionPoint name="psi.fileReferenceHelper"
                     interface="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceHelper"/>
 
-    <extensionPoint name="psi.referenceContributor" beanClass="com.intellij.psi.impl.source.resolve.reference.PsiReferenceContributorEP"/>
+    <extensionPoint name="psi.referenceContributor" beanClass="com.intellij.psi.impl.source.resolve.reference.PsiReferenceContributorEP">
+      <with attribute="implementation" implements="com.intellij.psi.PsiReferenceContributor"/>
+    </extensionPoint>
+
     <extensionPoint name="psi.referenceProvider" beanClass="com.intellij.psi.PsiReferenceProviderBean"/>
     <extensionPoint name="patterns.patternClass" beanClass="com.intellij.patterns.compiler.PatternClassBean"/>
 
     <extensionPoint name="pom.declarationSearcher" interface="com.intellij.pom.PomDeclarationSearcher"/>
 
-    <extensionPoint name="statistician" beanClass="com.intellij.psi.statistics.StatisticsExtensionPoint"/>
-    <extensionPoint name="weigher" beanClass="com.intellij.psi.WeigherExtensionPoint"/>
+    <extensionPoint name="statistician" beanClass="com.intellij.psi.statistics.StatisticsExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.statistics.Statistician"/>
+    </extensionPoint>
+
+    <extensionPoint name="weigher" beanClass="com.intellij.psi.WeigherExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.Weigher"/>
+    </extensionPoint>
+
     <extensionPoint name="forcedElementWeigher" interface="com.intellij.psi.util.proximity.ForcedElementWeigher"/>
-    <extensionPoint name="completion.contributor" beanClass="com.intellij.codeInsight.completion.CompletionContributorEP"/>
-    <extensionPoint name="completion.confidence" beanClass="com.intellij.codeInsight.completion.CompletionConfidenceEP"/>
+
+    <extensionPoint name="completion.contributor" beanClass="com.intellij.codeInsight.completion.CompletionContributorEP">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.completion.CompletionContributor"/>
+    </extensionPoint>
+
+    <extensionPoint name="completion.confidence" beanClass="com.intellij.codeInsight.completion.CompletionConfidenceEP">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.completion.CompletionConfidence"/>
+    </extensionPoint>
+
     <extensionPoint name="completion.skip" interface="com.intellij.codeInsight.completion.CompletionPreselectSkipper"/>
     <extensionPoint name="lookup.charFilter" interface="com.intellij.codeInsight.lookup.CharFilter"/>
     <extensionPoint name="lookup.actionProvider" interface="com.intellij.codeInsight.lookup.LookupActionProvider"/>
@@ -344,13 +457,24 @@
     <extensionPoint name="sdkFinder" interface="com.intellij.openapi.roots.impl.SdkFinder"/>
 
     <extensionPoint name="lang.implementationTextSelectioner"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.hint.ImplementationTextSelectioner"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.lineWrapStrategy"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.openapi.editor.LineWrapPositionStrategy"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.whiteSpaceFormattingStrategy"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.formatter.WhiteSpaceFormattingStrategy"/>
+    </extensionPoint>
+
     <extensionPoint name="lang.indentStrategy"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.openapi.editor.IndentStrategy"/>
+    </extensionPoint>
 
     <extensionPoint name="gotoDeclarationHandler"
                     interface="com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler"/>
@@ -368,8 +492,12 @@
     <extensionPoint name="automaticRenamerFactory" interface="com.intellij.refactoring.rename.naming.AutomaticRenamerFactory"/>
     <extensionPoint name="nameSuggestionProvider" interface="com.intellij.refactoring.rename.NameSuggestionProvider"/>
     <extensionPoint name="vetoRenameCondition" interface="com.intellij.openapi.util.Condition"/>
+
     <extensionPoint name="rename.inplace.resolveSnapshotProvider"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.rename.ResolveSnapshotProvider"/>
+    </extensionPoint>
+
     <extensionPoint name="renameInputValidator" interface="com.intellij.refactoring.rename.RenameInputValidator"/>
 
     <extensionPoint name="findUsagesHandlerFactory" interface="com.intellij.find.findUsages.FindUsagesHandlerFactory" area="IDEA_PROJECT"/>
@@ -378,14 +506,25 @@
     <extensionPoint name="readWriteAccessDetector" interface="com.intellij.codeInsight.highlighting.ReadWriteAccessDetector"/>
 
     <extensionPoint name="scopeParserExtension" interface="com.intellij.psi.search.scope.packageSet.PackageSetParserExtension"/>
+
     <extensionPoint name="referenceProviderType" beanClass="com.intellij.util.KeyedLazyInstanceEP"/>
+
     <extensionPoint name="colorSettingsPage" interface="com.intellij.openapi.options.colors.ColorSettingsPage"/>
     <extensionPoint name="colorAndFontPanelFactory" interface="com.intellij.application.options.colors.ColorAndFontPanelFactory"/>
     <extensionPoint name="colorAndFontDescriptorProvider" interface="com.intellij.openapi.options.colors.ColorAndFontDescriptorsProvider"/>
 
-    <extensionPoint name="codeInsight.parameterInfo" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="codeInsight.fillParagraph" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="editorOptionsProvider" beanClass="com.intellij.application.options.editor.EditorOptionsProviderEP"/>
+    <extensionPoint name="codeInsight.parameterInfo" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.parameterInfo.ParameterInfoHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="codeInsight.fillParagraph" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.editorActions.fillParagraph.ParagraphFillHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="editorOptionsProvider" beanClass="com.intellij.application.options.editor.EditorOptionsProviderEP">
+      <with attribute="instance" implements="com.intellij.application.options.editor.EditorOptionsProvider"/>
+    </extensionPoint>
+
     <extensionPoint name="fileTypeIndentOptionsProvider" interface="com.intellij.psi.codeStyle.FileTypeIndentOptionsProvider"/>
     <extensionPoint name="referenceImporter" interface="com.intellij.codeInsight.daemon.ReferenceImporter"/>
     <extensionPoint name="elementLookupRenderer" interface="com.intellij.codeInsight.lookup.impl.ElementLookupRenderer"/>
@@ -416,34 +555,65 @@
     <extensionPoint name="defaultLiveTemplatesProvider"
                     interface="com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider"/>
 
-    <extensionPoint name="codeInsight.implementMethod" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="codeInsight.overrideMethod" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="codeInsight.delegateMethods" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="codeInsight.gotoSuper" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="codeInsight.lineMarkerProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="codeInsight.implementMethod" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.LanguageCodeInsightActionHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="codeInsight.overrideMethod" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.LanguageCodeInsightActionHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="codeInsight.delegateMethods" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.LanguageCodeInsightActionHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="codeInsight.gotoSuper" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.LanguageCodeInsightActionHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="codeInsight.lineMarkerProvider" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.daemon.LineMarkerProvider"/>
+    </extensionPoint>
+
     <extensionPoint name="codeInsight.surroundWithRangeAdjuster"
                     interface="com.intellij.codeInsight.generation.surroundWith.SurroundWithRangeAdjuster"/>
 
-    <extensionPoint name="lang.substitutor" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="lang.substitutor" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.LanguageSubstitutor"/>
+    </extensionPoint>
 
     <extensionPoint name="createFromTemplateActionReplacer"
                     interface="com.intellij.ide.fileTemplates.CreateFromTemplateActionReplacer"/>
 
     <extensionPoint name="filetype.stubBuilder"
-                    beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
+                    beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.stubs.BinaryFileStubBuilder"/>
+    </extensionPoint>
+
     <extensionPoint name="stubElementTypeHolder"
                     beanClass="com.intellij.psi.stubs.StubElementTypeHolderEP"/>
 
     <extensionPoint name="moduleType"
-                    beanClass="com.intellij.openapi.module.ModuleTypeEP"/>
+                    beanClass="com.intellij.openapi.module.ModuleTypeEP">
+      <with attribute="implementationClass" implements="com.intellij.openapi.module.ModuleType"/>
+    </extensionPoint>
+
     <extensionPoint name="moduleBuilder"
-                    beanClass="com.intellij.ide.util.projectWizard.ModuleBuilderFactory"/>
+                    beanClass="com.intellij.ide.util.projectWizard.ModuleBuilderFactory">
+      <with attribute="builderClass" implements="com.intellij.ide.util.projectWizard.ModuleBuilder"/>
+    </extensionPoint>
+
     <extensionPoint name="projectTemplateParameterFactory"
                     interface="com.intellij.ide.util.projectWizard.ProjectTemplateParameterFactory"/>
     <extensionPoint name="facetType"
                     interface="com.intellij.facet.FacetType"/>
+
     <extensionPoint name="facet.toolWindow"
-                    beanClass="com.intellij.facet.ui.FacetDependentToolWindow"/>
+                    beanClass="com.intellij.facet.ui.FacetDependentToolWindow">
+      <with attribute="factoryClass" implements="com.intellij.openapi.wm.ToolWindowFactory"/>
+      <with attribute="conditionClass" implements="com.intellij.openapi.util.Condition"/>
+    </extensionPoint>
+
     <extensionPoint name="framework.detector"
                     interface="com.intellij.framework.detection.FrameworkDetector"/>
     <extensionPoint name="framework.type"
@@ -459,28 +629,40 @@
                     interface="com.intellij.testIntegration.TestFinder"/>
     <extensionPoint name="testSrcLocator"
                     interface="com.intellij.testIntegration.TestLocationProvider"/>
+
     <extensionPoint name="testCreator"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-
-    <extensionPoint name="constructorBodyGenerator"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-
-    <extensionPoint name="testGenerator"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.testIntegration.TestCreator"/>
+    </extensionPoint>
 
     <extensionPoint name="lang.smartEnterProcessor"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.editorActions.smartEnter.SmartEnterProcessor"/>
+    </extensionPoint>
 
     <extensionPoint name="moduleConfigurationEditorProvider"
                     interface="com.intellij.openapi.roots.ui.configuration.ModuleConfigurationEditorProvider"
                     area="IDEA_MODULE"/>
 
-    <extensionPoint name="callHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="methodHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="typeHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="callHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.ide.hierarchy.HierarchyProvider"/>
+    </extensionPoint>
+    <extensionPoint name="methodHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.ide.hierarchy.HierarchyProvider"/>
+    </extensionPoint>
+
+    <extensionPoint name="typeHierarchyProvider" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.ide.hierarchy.HierarchyProvider"/>
+    </extensionPoint>
+
+    <extensionPoint name="editorAppearanceConfigurable" beanClass="com.intellij.application.options.editor.EditorAppearanceConfigurableEP">
+      <with attribute="instance" implements="com.intellij.application.options.editor.EditorAppearanceConfigurable"/>
+    </extensionPoint>
+
+    <extensionPoint name="editorSmartKeysConfigurable" beanClass="com.intellij.application.options.editor.EditorSmartKeysConfigurableEP">
+      <with attribute="instance" implements="com.intellij.application.options.editor.EditorSmartKeysConfigurable"/>
+    </extensionPoint>
 
-    <extensionPoint name="editorAppearanceConfigurable" beanClass="com.intellij.application.options.editor.EditorAppearanceConfigurableEP"/>
-    <extensionPoint name="editorSmartKeysConfigurable" beanClass="com.intellij.application.options.editor.EditorSmartKeysConfigurableEP"/>
     <extensionPoint name="optionsApplicabilityFilter" interface="com.intellij.application.options.OptionsApplicabilityFilter"/>
 
     <extensionPoint name="metaDataContributor" interface="com.intellij.psi.meta.MetaDataContributor"/>
@@ -488,19 +670,28 @@
     <extensionPoint name="documentationProvider"
                     interface="com.intellij.lang.documentation.DocumentationProvider"/>
 
-    <extensionPoint name="lang.documentationFixer" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="lang.documentationFixer" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.documentation.DocCommentFixer"/>
+    </extensionPoint>
 
     <extensionPoint name="templateCompletionProcessor"
                     interface="com.intellij.codeInsight.template.macro.TemplateCompletionProcessor"/>
 
-    <extensionPoint name="targetElementEvaluator" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="targetElementEvaluator" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.TargetElementEvaluator"/>
+    </extensionPoint>
 
     <extensionPoint name="statementUpDownMover" interface="com.intellij.codeInsight.editorActions.moveUpDown.StatementUpDownMover"/>
 
     <extensionPoint name="fileLookupInfoProvider" interface="com.intellij.psi.file.FileLookupInfoProvider"/>
 
-    <extensionPoint name="idIndexer" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
-    <extensionPoint name="todoIndexer" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
+    <extensionPoint name="idIndexer" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.impl.cache.impl.id.FileTypeIdIndexer"/>
+    </extensionPoint>
+
+    <extensionPoint name="todoIndexer" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.util.indexing.DataIndexer"/>
+    </extensionPoint>
 
     <extensionPoint name="refactoring.elementListenerProvider"
                     interface="com.intellij.refactoring.listeners.RefactoringElementListenerProvider"
@@ -534,7 +725,9 @@
     <extensionPoint name="predefinedCodeStyle" interface="com.intellij.psi.codeStyle.PredefinedCodeStyle"/>
 
     <extensionPoint name="semContributor"
-                    beanClass="com.intellij.semantic.SemContributorEP" area="IDEA_PROJECT"/>
+                    beanClass="com.intellij.semantic.SemContributorEP" area="IDEA_PROJECT">
+      <with attribute="implementation" implements="com.intellij.semantic.SemContributor"/>
+    </extensionPoint>
 
     <extensionPoint name="typeName" beanClass="com.intellij.ide.TypeNameEP"/>
 
@@ -544,7 +737,9 @@
 
     <extensionPoint name="stacktrace.fold" beanClass="com.intellij.execution.console.CustomizableConsoleFoldingBean"/>
     <extensionPoint name="changeSignatureDetector"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.changeSignature.LanguageChangeSignatureDetector"/>
+    </extensionPoint>
 
     <extensionPoint name="preserveIndentOnPaste" beanClass="com.intellij.codeInsight.editorActions.PreserveIndentOnPasteBean"/>
 
@@ -570,21 +765,13 @@
                     interface="com.intellij.psi.impl.PsiTreeChangePreprocessor"
                     area="IDEA_PROJECT"/>
 
-    <extensionPoint name="psi.clsCustomNavigationPolicy"
-                    interface="com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy"/>
-    <extensionPoint name="psi.clsDecompiledFileProvider"
-                    interface="com.intellij.psi.ClsFileDecompiledPsiFileProvider"/>
-
     <extensionPoint name="codeBlockProvider"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.editorActions.CodeBlockProvider"/>
+    </extensionPoint>
 
     <extensionPoint name="moduleRendererFactory" interface="com.intellij.ide.util.ModuleRendererFactory"/>
 
-    <extensionPoint name="html.scriptContentProvider"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="html.inlineScriptTokenTypesProvider"
-                    beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-
     <extensionPoint name="toolsProvider" interface="com.intellij.tools.ToolsProvider"/>
 
     <extensionPoint name="defaultHighlightingSettingProvider"
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 7b4d37ede6f0..906fa68fe0ac 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -333,8 +333,8 @@
                     serviceImplementation="com.intellij.openapi.roots.impl.LibraryScopeCache"/>
 
     <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.GeneralColorsPage" id="general"/>
-    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.DefaultLanguageColorsPage" id="general"/>
-    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.ANSIColoredConsoleColorsPage" id="general"/>
+    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.DefaultLanguageColorsPage" id="defaultLanguage"/>
+    <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.ANSIColoredConsoleColorsPage" id="ansi"/>
     <colorSettingsPage implementation="com.intellij.openapi.options.colors.pages.CustomColorsPage" id="custom"/>
 
     <elementDescriptionProvider implementation="com.intellij.psi.impl.DefaultPomTargetDescriptionProvider" order="last" id="pomDefault"/>
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
index 4cdac7626907..d23e7fe23f10 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
@@ -75,7 +75,7 @@
 
     <extensionPoint name="syntaxHighlighter"
                     beanClass="com.intellij.openapi.extensions.KeyedFactoryEPBean">
-      <with attribute="implementationClass" implements="com.intellij.openapi.fileTypes.SyntaxHighlighterProvider"/>
+      <with attribute="implementationClass" implements="com.intellij.openapi.fileTypes.SyntaxHighlighter"/>
     </extensionPoint>
 
     <extensionPoint name="lang.syntaxHighlighterFactory"
@@ -119,17 +119,24 @@
       <with attribute="implementationClass" implements="com.intellij.openapi.editor.actionSystem.EditorActionHandler"/>
     </extensionPoint>
 
-    <extensionPoint name="editorTypedHandler" beanClass="com.intellij.openapi.editor.actionSystem.EditorTypedHandlerBean"/>
+    <extensionPoint name="editorTypedHandler" beanClass="com.intellij.openapi.editor.actionSystem.EditorTypedHandlerBean">
+      <with attribute="implementationClass" implements="com.intellij.openapi.editor.actionSystem.TypedActionHandler"/>
+    </extensionPoint>
     <extensionPoint name="contentBasedClassFileProcessor" interface="com.intellij.openapi.fileTypes.ContentBasedClassFileProcessor"/>
 
-    <extensionPoint name="browserSettingsProvider" beanClass="com.intellij.ide.BrowserSettingsProviderEP"/>
+    <extensionPoint name="browserSettingsProvider" beanClass="com.intellij.ide.BrowserSettingsProviderEP">
+      <with attribute="instance" implements="com.intellij.ide.BrowserSettingsProvider"/>
+    </extensionPoint>
 
     <extensionPoint name="additionalTextAttributes" beanClass="com.intellij.openapi.editor.colors.impl.AdditionalTextAttributesEP" />
     <extensionPoint name="bundledColorSchemesProvider" interface="com.intellij.openapi.editor.colors.impl.BundledColorSchemesProvider"/>
     <extensionPoint name="bundledQuickListsProvider" interface="com.intellij.openapi.actionSystem.impl.BundledQuickListsProvider"/>
     <extensionPoint name="bundledKeymapProvider" interface="com.intellij.openapi.keymap.impl.BundledKeymapProvider"/>
 
-    <extensionPoint name="toolWindow" beanClass="com.intellij.openapi.wm.ToolWindowEP"/>
+    <extensionPoint name="toolWindow" beanClass="com.intellij.openapi.wm.ToolWindowEP">
+      <with attribute="factoryClass" implements="com.intellij.openapi.wm.ToolWindowFactory"/>
+      <with attribute="conditionClass" implements="com.intellij.openapi.util.Condition"/>
+    </extensionPoint>
     <extensionPoint name="welcomeScreen" interface="com.intellij.openapi.wm.WelcomeScreenProvider"/>
     <extensionPoint name="welcomeFrameProvider" interface="com.intellij.openapi.wm.WelcomeFrameProvider"/>
     <extensionPoint name="frameEditorComponentProvider" interface="com.intellij.openapi.wm.ex.FrameEditorComponentProvider"/>
@@ -142,7 +149,9 @@
 
     <extensionPoint name="customizableActionGroupProvider" interface="com.intellij.ide.ui.customization.CustomizableActionGroupProvider"/>
 
-    <extensionPoint name="generalOptionsProvider" beanClass="com.intellij.ide.GeneralSettingsConfigurableEP"/>
+    <extensionPoint name="generalOptionsProvider" beanClass="com.intellij.ide.GeneralSettingsConfigurableEP">
+      <with attribute="instance" implements="com.intellij.openapi.options.SearchableConfigurable"/>
+    </extensionPoint>
 
     <extensionPoint name="statusBarComponent" interface="com.intellij.openapi.wm.StatusBarCustomComponentFactory"/>
 
@@ -159,12 +168,16 @@
 
     <extensionPoint name="xmlRpcHandler" beanClass="com.intellij.ide.XmlRpcHandlerBean"/>
 
-    <extensionPoint name="editorHighlighterProvider" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
+    <extensionPoint name="editorHighlighterProvider" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.openapi.fileTypes.EditorHighlighterProvider"/>
+    </extensionPoint>
     <extensionPoint name="fileDocumentManagerListener" interface="com.intellij.openapi.fileEditor.FileDocumentManagerListener"/>
     <extensionPoint name="exceptionFilter" interface="com.intellij.execution.filters.ExceptionFilterFactory"/>
     <extensionPoint name="fileDocumentSynchronizationVetoer" interface="com.intellij.openapi.fileEditor.FileDocumentSynchronizationVetoer"/>
 
-    <extensionPoint name="itemPresentationProvider" beanClass="com.intellij.openapi.util.ClassExtensionPoint"/>
+    <extensionPoint name="itemPresentationProvider" beanClass="com.intellij.openapi.util.ClassExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.navigation.ItemPresentationProvider"/>
+    </extensionPoint>
 
     <extensionPoint name="classpathStorageProvider" interface="com.intellij.openapi.roots.impl.storage.ClasspathStorageProvider"/>
     <extensionPoint name="fileTypeDetector" interface="com.intellij.openapi.fileTypes.FileTypeRegistry$FileTypeDetector"/>
diff --git a/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml b/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
index aff52957aed9..3905e130e141 100644
--- a/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml
@@ -11,7 +11,9 @@
 
     <extensionPoint name="vcs"
                     beanClass="com.intellij.openapi.vcs.impl.VcsEP"
-                    area="IDEA_PROJECT"/>
+                    area="IDEA_PROJECT">
+      <with attribute="vcsClass" implements="com.intellij.openapi.vcs.AbstractVcs"/>
+    </extensionPoint>
 
     <extensionPoint name="checkinHandlerFactory"
                     interface="com.intellij.openapi.vcs.checkin.CheckinHandlerFactory"
diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 5bf0b9d30736..b08ebdc840c8 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -64,6 +64,16 @@
     <extensionPoint name="xml.html5SchemaProvider" interface="com.intellij.xml.Html5SchemaProvider"/>
 
     <extensionPoint qualifiedName="org.jetbrains.urlOpener" interface="com.intellij.ide.browsers.UrlOpener"/>
+
+    <extensionPoint name="html.scriptContentProvider"
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.HtmlScriptContentProvider"/>
+    </extensionPoint>
+
+    <extensionPoint name="html.inlineScriptTokenTypesProvider"
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.lang.HtmlInlineScriptTokenTypesProvider"/>
+    </extensionPoint>
   </extensionPoints>
 
   <project-components>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 8d6a96a2e021..a9768a9a1cef 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -135,16 +135,25 @@
     <extensionPoint name="debuggerClassFilterProvider" interface="com.intellij.ui.classFilter.DebuggerClassFilterProvider"/>
     <extensionPoint name="topLevelClassProvider" interface="com.intellij.debugger.engine.TopLevelParentClassProvider"/>
 
-    <extensionPoint name="debuggerEditorTextProvider" beanClass="com.intellij.lang.LanguageExtensionPoint" />
+    <extensionPoint name="debuggerEditorTextProvider" beanClass="com.intellij.lang.LanguageExtensionPoint" >
+      <with attribute="implementationClass" implements="com.intellij.debugger.impl.EditorTextProvider"/>
+    </extensionPoint>
 
     <extensionPoint name="javadocTagInfo" area="IDEA_PROJECT" interface="com.intellij.psi.javadoc.JavadocTagInfo"/>
 
     <extensionPoint name="refactoring.introduceParameterMethodUsagesProcessor" interface="com.intellij.refactoring.introduceParameter.IntroduceParameterMethodUsagesProcessor"/>
 
-    <extensionPoint name="annotationSupport" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
-    <extensionPoint name="constantExpressionEvaluator" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="annotationSupport" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.PsiAnnotationSupport"/>
+    </extensionPoint>
 
-    <extensionPoint name="expressionConverter" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="constantExpressionEvaluator" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.impl.ConstantExpressionEvaluator"/>
+    </extensionPoint>
+
+    <extensionPoint name="expressionConverter" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.introduceParameter.ExpressionConverter"/>
+    </extensionPoint>
 
     <!--<extensionPoint name="expectedTypesProvider" interface="com.intellij.codeInsight.ExpectedTypesProviderExtension"/>-->
 
@@ -153,13 +162,50 @@
 
     <extensionPoint name="allowedApiFilter" interface="com.intellij.psi.impl.AllowedApiFilterExtension"/>
 
-    <extensionPoint name="generation.topLevelFactory" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="generation.topLevelFactory" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.psi.JVMElementFactoryProvider"/>
+    </extensionPoint>
 
-    <extensionPoint name="codeInsight.createFieldFromUsageHelper" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="codeInsight.createFieldFromUsageHelper" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.daemon.impl.quickfix.CreateFieldFromUsageHelper"/>
+    </extensionPoint>
 
     <extensionPoint name="library.dependencyScopeSuggester" interface="com.intellij.openapi.roots.LibraryDependencyScopeSuggester"/>
 
-    <extensionPoint name="refactoring.safeDelete.JavaSafeDeleteDelegate" beanClass="com.intellij.lang.LanguageExtensionPoint"/>
+    <extensionPoint name="refactoring.safeDelete.JavaSafeDeleteDelegate" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate"/>
+    </extensionPoint>
+
+    <extensionPoint name="constructorBodyGenerator"
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.codeInsight.generation.ConstructorBodyGenerator"/>
+    </extensionPoint>
+
+    <extensionPoint name="refactoring.moveInnerHandler" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveInner.MoveInnerHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="refactoring.moveClassToInnerHandler"
+                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerHandler"/>
+
+    <extensionPoint name="refactoring.moveAllClassesInFileHandler"
+                    interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveAllClassesInFileHandler"/>
+
+    <extensionPoint name="refactoring.moveClassHandler" interface="com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler"/>
+
+    <extensionPoint name="refactoring.moveMemberHandler" beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.refactoring.move.moveMembers.MoveMemberHandler"/>
+    </extensionPoint>
+
+    <extensionPoint name="testGenerator"
+                    beanClass="com.intellij.lang.LanguageExtensionPoint">
+      <with attribute="implementationClass" implements="com.intellij.testIntegration.createTest.TestGenerator"/>
+    </extensionPoint>
+
+    <extensionPoint name="psi.clsCustomNavigationPolicy"
+                    interface="com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy"/>
+    <extensionPoint name="psi.clsDecompiledFileProvider"
+                    interface="com.intellij.psi.ClsFileDecompiledPsiFileProvider"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/xml/dom-impl/src/META-INF/DomPlugin.xml b/xml/dom-impl/src/META-INF/DomPlugin.xml
index 3b2e0ff1e073..3cdb2f68dc92 100644
--- a/xml/dom-impl/src/META-INF/DomPlugin.xml
+++ b/xml/dom-impl/src/META-INF/DomPlugin.xml
@@ -10,7 +10,9 @@
                     beanClass="com.intellij.util.xml.impl.DomImplementationClassEP"/>
 
     <extensionPoint name="dom.extender"
-                    beanClass="com.intellij.util.xml.reflect.DomExtenderEP"/>
+                    beanClass="com.intellij.util.xml.reflect.DomExtenderEP">
+      <with attribute="myDomClass" implements="com.intellij.util.xml.reflect.DomExtender"/>
+    </extensionPoint>
 
     <extensionPoint name="dom.customAnnotationChecker"
                     interface="com.intellij.util.xml.highlighting.DomCustomAnnotationChecker"/>