diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
index c10f796d97b35bccb3e521748830ac70d3c8ebe7..ea5fe6ba308d942f114cf4a862e5fd4e366ee627 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
@@ -7,7 +7,6 @@ extension-point.org.jkiss.dbeaver.dataSourceProvider.name = DataSource provider
 extension-point.org.jkiss.dbeaver.dataSourceView.name = DataSource views
 extension-point.org.jkiss.dbeaver.databaseEditor.name = Custom Entity Editor
 extension-point.org.jkiss.dbeaver.dataTypeProvider.name = DataType provider
-extension-point.org.jkiss.dbeaver.dataManager.name = Data value managers
 extension-point.org.jkiss.dbeaver.objectManager.name = Database object managers
 extension-point.org.jkiss.dbeaver.sqlCommand.name = SQL script commands
 extension-point.org.jkiss.dbeaver.sqlFormatter.name = SQL formatters
@@ -41,9 +40,6 @@ language.ja.label=Japanese
 editor.sql.name=SQL Editor
 editor.folder.name=Folder Editor
 editor.entity.name=Entity Editor
-editor.lob.name=Large Object Editor
-editor.dbdata.name=Data
-editor.dbdata.description=Table data
 
 command.org.eclipse.ui.edit.copy.name = Copy
 command.org.eclipse.ui.edit.delete.name = Delete
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
index c88f85975c20aabd9acafa604653ccb91a951614..7251b2e019b915a694703a03bd08af05e7f9a8f4 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
@@ -345,16 +345,12 @@ context.org.jkiss.dbeaver.ui.context.resultset.name             = Kontext der Er
 context.org.jkiss.dbeaver.ui.editors.sql.name                   = Kontext SQL-Editor
 context.org.jkiss.dbeaver.ui.editors.sql.scriptname             = Kontext SQL-Skripteditor
 
-editor.dbdata.description = Tabellendaten
-editor.dbdata.name        = Daten
 editor.entity.name        = Entit\u00E4teneditor
 editor.folder.name        = Ordnereditor
-editor.lob.name           = Gro\u00DFobjekt-Editor
 editor.sql.name           = SQL-Editor
 
 extension-point.org.jkiss.dbeaver.aggregateFunction.name       = Aggregatsfunktionen
 extension-point.org.jkiss.dbeaver.dataFormatter.name           = Datenformatierungen
-extension-point.org.jkiss.dbeaver.dataManager.name             = Datenmanager
 extension-point.org.jkiss.dbeaver.dataSourceProvider.name      = DataSource-Provider
 extension-point.org.jkiss.dbeaver.dataSourceView.name          = DataSource-Ansichten
 extension-point.org.jkiss.dbeaver.dataTypeProvider.name        = DataSource-Provider
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_es.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_es.properties
index 055596999e4c0227667327a24f2858ba18392fdc..6579ba0df565e9477c579ffbc250cdab7ae17ece 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_es.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_es.properties
@@ -5,9 +5,6 @@ view.shell.process.title = Procesos
 editor.sql.name = Editor SQL
 editor.folder.name = Editor de Carpeta
 editor.entity.name = Editor de Entidad
-editor.lob.name = Editor LOB
-editor.dbdata.name = Datos
-editor.dbdata.description = Tabla de datos
 command.org.jkiss.dbeaver.core.driver.manager.name = Gestor de Driver
 command.org.jkiss.dbeaver.core.driver.manager.description = Gestor de Driver
 command.org.jkiss.dbeaver.core.new.connection.name = Nueva Conexi\u0443n
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties
index 6382af7f3676c6e01747f5be53bd9671cc1d4bec..b429b5bb37003265aabdda9c3a9a1ffb4649aa37 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties
@@ -10,7 +10,6 @@ extension-point.org.jkiss.dbeaver.mavenRepository.name = Config des d\u00E9p\u00
 extension-point.org.jkiss.dbeaver.dataSourceProvider.name = Fournisseur de Sources de donn\u00E9es
 extension-point.org.jkiss.dbeaver.databaseEditor.name = Editeur d'entit\u00E9 personnalis\u00E9es
 extension-point.org.jkiss.dbeaver.dataTypeProvider.name = Fournisseur de types de donn\u00E9es
-extension-point.org.jkiss.dbeaver.dataManager.name = Gestionnaires de donn\u00E9es
 extension-point.org.jkiss.dbeaver.sqlCommand.name = Commandes de scripts SQL
 extension-point.org.jkiss.dbeaver.sqlFormatter.name = Formateurs SQL
 extension-point.org.jkiss.dbeaver.resourceHandler.name = Handlers de ressources
@@ -282,11 +281,8 @@ command.org.jkiss.dbeaver.ui.tools.select.schema.description = S\u00E9lectionner
 command.org.jkiss.dbeaver.ui.tools.select.connection.name = D\u00E9finir la connexion active
 command.org.jkiss.dbeaver.ui.tools.select.connection.description = Su00E9lectionner la connexion pour l'\u00E9diteur en cours
 
-editor.dbdata.description = Donn\u00E9es en table
-editor.dbdata.name        = Donn\u00E9es
 editor.entity.name        = Editeur d'entit\u00E9
 editor.folder.name        = Editeur de r\u00E9pertoire
-editor.lob.name           = Editeur de gros objets
 editor.sql.name           = Editeur SQL
 
 menu.database              = &Base de donn\u00E9es
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_it.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_it.properties
index aa68604b204f596a2397695e696e2fcd72450331..072c0e7c5c11ce95b48478bde47bb3f798f9a41b 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_it.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_it.properties
@@ -5,9 +5,6 @@ view.shell.process.title = Processo
 editor.sql.name = Editor SQL
 editor.folder.name = Editor Cartella
 editor.entity.name = Editor Entit\u00E0
-editor.lob.name = Editor Oggetto Grande
-editor.dbdata.name = Dati
-editor.dbdata.description = Tabella dati
 command.org.jkiss.dbeaver.core.driver.manager.name = Gestore Driver
 command.org.jkiss.dbeaver.core.driver.manager.description = Gestore Driver
 command.org.jkiss.dbeaver.core.new.connection.name = Nuova Connessione
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties
index 9b1a49a90f27242a48e6f910a4d8d7692bc6252a..f24ae9540e639ffce1a26a0a8e7ecfc757134b73 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties
@@ -4,7 +4,6 @@ extension-point.org.jkiss.dbeaver.mavenRepository.name =Maven\u30EA\u30DD\u30B8\
 extension-point.org.jkiss.dbeaver.dataSourceProvider.name =\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30D7\u30ED\u30D0\u30A4\u30C0
 extension-point.org.jkiss.dbeaver.databaseEditor.name =\u30AB\u30B9\u30BF\u30E0\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30A8\u30C7\u30A3\u30BF
 extension-point.org.jkiss.dbeaver.dataTypeProvider.name =\u30C7\u30FC\u30BF\u578B\u30D7\u30ED\u30D0\u30A4\u30C0
-extension-point.org.jkiss.dbeaver.dataManager.name =\u30C7\u30FC\u30BF\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC
 extension-point.org.jkiss.dbeaver.sqlCommand.name =SQL\u30B9\u30AF\u30EA\u30D7\u30C8\u30B3\u30DE\u30F3\u30C9
 extension-point.org.jkiss.dbeaver.sqlFormatter.name =SQL\u30D5\u30A9\u30FC\u30DE\u30C3\u30BF
 extension-point.org.jkiss.dbeaver.resourceHandler.name =\u30EA\u30BD\u30FC\u30B9\u30CF\u30F3\u30C9\u30E9
@@ -38,9 +37,6 @@ language.it.label=Italian
 editor.sql.name=SQL\u30A8\u30C7\u30A3\u30BF
 editor.folder.name=\u30D5\u30A9\u30EB\u30C0\u30A8\u30C7\u30A3\u30BF
 editor.entity.name=\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u30A8\u30C7\u30A3\u30BF
-editor.lob.name=\u30E9\u30FC\u30B8\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30A8\u30C7\u30A3\u30BF
-editor.dbdata.name=\u30C7\u30FC\u30BF
-editor.dbdata.description=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF
 
 command.org.eclipse.ui.edit.copy.name =\u30B3\u30D4\u30FC
 command.org.eclipse.ui.edit.delete.name =\u524A\u9664
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties
index fe585e76c25ab5dcf830a830f7ef1b1fa9720b43..726e304653c126328a523e86e0b658874fb83ffc 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties
@@ -217,10 +217,7 @@ commandParameter.org.jkiss.dbeaver.core.resource.link.file.contenttype.name = Li
 
 content-type.org.jkiss.dbeaver.bookmark.name = \u0417\u0430\u043A\u043B\u0430\u0434\u043A\u0430
 
-editor.dbdata.description = \u0414\u0430\u043D\u043D\u044B\u0435 \u0442\u0430\u0431\u043B\u0438\u0446\u044B
-editor.dbdata.name        = \u0414\u0430\u043D\u043D\u044B\u0435
 editor.entity.name        = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0441\u0443\u0449\u043D\u043E\u0441\u0442\u0438
-editor.lob.name           = Large Object Editor
 editor.sql.name           = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 SQL
 
 menu.database                                                 = \u0411\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
index 385e7b977611f12fb13e7c568d7b4173474e76e8..4fc8f8d0c88e90fcd8758f5b9e9eb766f73c82ee 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
@@ -347,14 +347,10 @@ context.org.jkiss.dbeaver.ui.context.resultset.name             = \u7ED3\u679C\u
 context.org.jkiss.dbeaver.ui.editors.sql.name                   = SQL \u7F16\u8F91\u5668\u4E0A\u4E0B\u6587
 context.org.jkiss.dbeaver.ui.editors.sql.scriptname             = SQL \u811A\u672C\u7F16\u8F91\u5668\u4E0A\u4E0B\u6587
 
-editor.dbdata.description = \u8868\u6570\u636E
-editor.dbdata.name        = \u6570\u636E
 editor.entity.name        = \u5B9E\u4F53\u7F16\u8F91\u5668
 editor.folder.name        = \u6587\u4EF6\u5939\u7F16\u8F91\u5668
-editor.lob.name           = \u5927\u578B\u5BF9\u8C61\u7F16\u8F91\u5668
 editor.sql.name           = SQL \u7F16\u8F91\u5668
 
-extension-point.org.jkiss.dbeaver.dataManager.name             = \u6570\u636E\u7BA1\u7406\u5668
 extension-point.org.jkiss.dbeaver.dataSourceProvider.name      = \u6570\u636E\u6E90\u63D0\u4F9B\u8005
 extension-point.org.jkiss.dbeaver.dataSourceView.name          = \u6570\u636E\u6E90\u67E5\u770B\u5668
 extension-point.org.jkiss.dbeaver.dataTypeProvider.name        = \u6570\u636E\u7C7B\u578B\u63D0\u4F9B\u8005
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index e105671c10d01a965f0ce38cbdf286fe558d2c06..dd0cca6b07725fc86ac75f560a259f347278c710 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -35,7 +35,6 @@
 
     <!-- UI extensions -->
     <extension-point id="org.jkiss.dbeaver.dataSourceView" name="%extension-point.org.jkiss.dbeaver.dataSourceView.name" schema="schema/org.jkiss.dbeaver.dataSourceView.exsd"/>
-    <extension-point id="org.jkiss.dbeaver.dataManager" name="%extension-point.org.jkiss.dbeaver.dataManager.name" schema="schema/org.jkiss.dbeaver.dataManager.exsd"/>
     <extension-point id="org.jkiss.dbeaver.sql.covert" name="%extension-point.org.jkiss.dbeaver.sql.covertname" schema="schema/org.jkiss.dbeaver.sql.convert.exsd"/>
     <extension-point id="org.jkiss.dbeaver.sqlCommand" name="%extension-point.org.jkiss.dbeaver.sqlCommand.name" schema="schema/org.jkiss.dbeaver.sqlCommand.exsd"/>
     <extension-point id="org.jkiss.dbeaver.sqlPresentation" name="%extension-point.org.jkiss.dbeaver.sqlCommand.name" schema="schema/org.jkiss.dbeaver.sqlPresentation.exsd"/>
@@ -97,18 +96,6 @@
             namespace="org.jkiss.dbeaver.core.resource"
             properties="canOpen,canDelete,canCreateFolder,canCreateLink,canSetActive,type"
             type="org.eclipse.core.resources.IResource"/>
-        <propertyTester
-            class="org.jkiss.dbeaver.ui.editors.DatabaseEditorPropertyTester"
-            id="org.jkiss.dbeaver.ui.editors.DatabaseEditorPropertyTester"
-            namespace="org.jkiss.dbeaver.database.editor"
-            properties="active"
-            type="org.jkiss.dbeaver.ui.editors.IDatabaseEditor"/>
-        <propertyTester
-            class="org.jkiss.dbeaver.ui.editors.text.TextEditorPropertyTester"
-            id="org.jkiss.dbeaver.ui.editors.text.TextEditorPropertyTester"
-            namespace="org.jkiss.dbeaver.ui.editors.text"
-            properties="available,canComment,canLoad,canSave"
-            type="org.eclipse.ui.IEditorPart"/>
         <propertyTester
             class="org.jkiss.dbeaver.ui.editors.sql.SQLEditorPropertyTester"
             id="org.jkiss.dbeaver.ui.editors.sql.SQLEditorPropertyTester"
@@ -121,30 +108,6 @@
             namespace="org.jkiss.dbeaver.ui.editors.sql.util"
             properties="canGenerate,hasTools"
             type="org.eclipse.ui.IWorkbenchPart"/>
-        <propertyTester
-            class="org.jkiss.dbeaver.ui.controls.resultset.ResultSetPropertyTester"
-            id="org.jkiss.dbeaver.ui.controls.resultset.ResultSetPropertyTester"
-            namespace="org.jkiss.dbeaver.core.resultset"
-            properties="active,hasData,hasMoreData,canCopy,canPaste,canCut,canMove,editable,changed,canToggle,canSwitchPresentation,canNavigateLink,canNavigateHistory,supportsCount"
-            type="org.eclipse.ui.IWorkbenchPart"/>
-        <propertyTester
-            class="org.jkiss.dbeaver.ui.controls.resultset.panel.valueviewer.ValueViewPropertyTester"
-            id="org.jkiss.dbeaver.ui.controls.resultset.panel.valueviewer.ValueViewPropertyTester"
-            namespace="org.jkiss.dbeaver.core.resultset.panel.valueView"
-            properties="active"
-            type="org.eclipse.ui.IWorkbenchPart"/>
-        <propertyTester
-            class="org.jkiss.dbeaver.ui.editors.entity.EntityEditorPropertyTester"
-            id="org.jkiss.dbeaver.ui.editors.entity.EntityEditorPropertyTester"
-            namespace="org.jkiss.dbeaver.ui.editors.entity"
-            properties="dirty,canUndo,canRedo"
-            type="org.jkiss.dbeaver.ui.editors.entity.EntityEditor"/>
-        <propertyTester
-            class="org.jkiss.dbeaver.ui.editors.entity.FolderEditorPropertyTester"
-            id="org.jkiss.dbeaver.ui.editors.entity.FolderEditorPropertyTester"
-            namespace="org.jkiss.dbeaver.ui.editors.folder"
-            properties="canNavigate"
-            type="org.jkiss.dbeaver.ui.editors.entity.FolderEditor"/>
         <propertyTester
             class="org.jkiss.dbeaver.ui.views.process.ProcessPropertyTester"
             id="org.jkiss.dbeaver.ui.views.process.ProcessPropertyTester"
@@ -2760,13 +2723,6 @@
                 class="org.jkiss.dbeaver.ui.editors.entity.EntityEditor"
                 id="org.jkiss.dbeaver.ui.editors.entity.EntityEditor">
         </editor>
-        <editor
-                name="%editor.lob.name"
-                icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/binary.png"
-                contributorClass="org.jkiss.dbeaver.ui.editors.content.ContentEditorContributor"
-                class="org.jkiss.dbeaver.ui.editors.content.ContentEditor"
-                id="org.jkiss.dbeaver.ui.editors.content.ContentEditor">
-        </editor>
     </extension>
 
     <extension point="org.eclipse.ui.workbench.texteditor.rulerColumns">
@@ -3348,19 +3304,6 @@
         <manager class="org.jkiss.dbeaver.registry.DataSourceDescriptorManager" objectType="org.jkiss.dbeaver.model.DBPDataSourceContainer"/>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.databaseEditor">
-        <editor
-                id="org.jkiss.dbeaver.ui.editors.data.DatabaseDataEditor"
-                class="org.jkiss.dbeaver.ui.editors.data.DatabaseDataEditor"
-                objectType="org.jkiss.dbeaver.model.struct.DBSDataContainer"
-                main="false"
-                label="%editor.dbdata.name"
-                description="%editor.dbdata.description"
-                position="additions_start"
-                icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_table.png">
-        </editor>
-    </extension>
-
     <extension point="org.jkiss.dbeaver.dataTypeProvider">
         <provider class="org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCStandardValueHandlerProvider" id="org.jkiss.dbeaver.core.standardDataTypeProvider">
             <type standard="BIT"/>
@@ -3495,7 +3438,7 @@
             <type kind="BINARY"/>
             <type kind="CONTENT"/>
         </transformer>
-	<transformer
+	    <transformer
                 class="org.jkiss.dbeaver.model.impl.data.transformers.UUIDOrderedAttributeTransformer"
                 id="org.jkiss.dbeaver.core.UUIDOrderedAttributeTransformer"
                 name="UUID (Ordered)"
@@ -3533,61 +3476,6 @@
         <formatter id="external" class="org.jkiss.dbeaver.model.sql.format.external.SQLFormatterExternal" configurerClass="org.jkiss.dbeaver.ui.editors.sql.format.SQLExternalFormatterConfigurationPage" label="External formatter" description="External formatter. Uses configurable command-line executable to format SQL queries"/>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.dataManager">
-<!--
-        <manager class="org.jkiss.dbeaver.ui.data.managers.BooleanValueManager" id="org.jkiss.dbeaver.ui.data.managers.BooleanValueManager">
-            <supports kind="BOOLEAN"/>
-        </manager>
--->
-        <manager class="org.jkiss.dbeaver.ui.data.managers.NumericValueManager" id="org.jkiss.dbeaver.ui.data.managers.NumericValueManager">
-            <supports kind="NUMERIC"/>
-            <supports kind="BOOLEAN"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.StringValueManager" id="org.jkiss.dbeaver.ui.data.managers.StringValueManager">
-            <supports kind="STRING"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.DateTimeValueManager" id="org.jkiss.dbeaver.ui.data.managers.DateTimeValueManager">
-            <supports kind="DATETIME"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.ArrayValueManager" id="org.jkiss.dbeaver.ui.data.managers.ArrayValueManager">
-            <supports kind="ARRAY"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.ReferenceValueManager" id="org.jkiss.dbeaver.ui.data.managers.ReferenceValueManager">
-            <supports kind="REFERENCE"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.StructValueManager" id="org.jkiss.dbeaver.ui.data.managers.StructValueManager">
-            <supports kind="STRUCT"/>
-            <supports type="java.util.Map"/>
-            <supports type="java.util.List"/>
-            <supports type="java.util.Set"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.ContentValueManager" id="org.jkiss.dbeaver.ui.data.managers.ContentValueManager">
-            <supports kind="CONTENT"/>
-            <supports kind="BINARY"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.ObjectValueManager" id="org.jkiss.dbeaver.ui.data.managers.ObjectValueManager">
-            <supports kind="OBJECT"/>
-            <supports kind="DOCUMENT"/>
-            <supports kind="ROWID"/>
-            <supports kind="ANY"/>
-            <supports typeName="REFCURSOR"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.UUIDValueManager" id="org.jkiss.dbeaver.ui.data.managers.UUIDValueManager">
-            <supports type="java.util.UUID"/>
-        </manager>
-        <manager class="org.jkiss.dbeaver.ui.data.managers.URLPreviewValueManager" id="org.jkiss.dbeaver.ui.data.managers.URLPreviewValueManager">
-            <supports typeName="URL.Preview"/>
-        </manager>
-<!--
-        <manager class="org.jkiss.dbeaver.ui.data.managers.RowIdValueManager" id="org.jkiss.dbeaver.ui.data.managers.RowIdValueManager">
-            <supports kind="ROWID"/>
-        </manager>
--->
-        <manager class="org.jkiss.dbeaver.ui.data.managers.DefaultValueManager" id="DefaultValueManager">
-        </manager>
-
-    </extension>
-
     <extension point="org.jkiss.dbeaver.resourceHandler">
         <handler id="projects" class="org.jkiss.dbeaver.ui.resources.ProjectHandlerImpl">
             <resourceTypeBinding resourceType="org.eclipse.core.resources.IProject"/>
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.base/plugin.xml b/plugins/org.jkiss.dbeaver.ui.editors.base/plugin.xml
index 3ebb9580918bf9062f7ca09c6169208379bb9b01..7f4bf8d5090e00fbde5839c393c1e9e482a6d3d4 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.base/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.editors.base/plugin.xml
@@ -3,5 +3,19 @@
 
 <plugin>
 
+    <extension point="org.eclipse.core.expressions.propertyTesters">
+        <propertyTester
+                class="org.jkiss.dbeaver.ui.editors.DatabaseEditorPropertyTester"
+                id="org.jkiss.dbeaver.ui.editors.DatabaseEditorPropertyTester"
+                namespace="org.jkiss.dbeaver.database.editor"
+                properties="active"
+                type="org.jkiss.dbeaver.ui.editors.IDatabaseEditor"/>
+        <propertyTester
+                class="org.jkiss.dbeaver.ui.editors.text.TextEditorPropertyTester"
+                id="org.jkiss.dbeaver.ui.editors.text.TextEditorPropertyTester"
+                namespace="org.jkiss.dbeaver.ui.editors.text"
+                properties="available,canComment,canLoad,canSave"
+                type="org.eclipse.ui.IEditorPart"/>
+    </extension>
 
 </plugin>
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties
index 4df289eab7da0a76b8ccc8be85864e5b985f0476..34edeafd7af54b8b0c0e945fe8ef83f159f0c671 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle.properties
@@ -1,6 +1,7 @@
 Bundle-Vendor = DBeaver Corp
 Bundle-Name = DBeaver UI Editors - Data
 
+extension-point.org.jkiss.dbeaver.dataManager.name = Data value managers
 extension-point.org.jkiss.dbeaver.resultset.presentation.name = Result set presentations
 extension-point.org.jkiss.dbeaver.resultset.panel.name = Result set panels
 
@@ -18,6 +19,9 @@ panel.results-metadata.description = ResultSet metadata description
 panel.results-grouping.label = Grouping
 panel.results-grouping.description = Results grouping (GROUP BY)
 
+editor.lob.name=Large Object Editor
+editor.dbdata.name=Data
+editor.dbdata.description=Table data
 
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=Type
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=Name
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties
index 3ac0a91b7647d0f73500cb991ccb19783e2ae90d..14ad636d074c0d19bb1daf1229447f777102b55c 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_de.properties
@@ -1,4 +1,5 @@
 
+extension-point.org.jkiss.dbeaver.dataManager.name             = Datenmanager
 extension-point.org.jkiss.dbeaver.resultset.panel.name         = Ergebnismengenfelder
 extension-point.org.jkiss.dbeaver.resultset.presentation.name  = Pr\u00E4sentationen der Ergebnismenge
 
@@ -14,6 +15,10 @@ panel.results-metadata.label       = Metadaten
 panel.value-view.description       = Ergebniszellen-Wertanzeige
 panel.value-view.label             = Wert
 
+editor.lob.name           = Gro\u00DFobjekt-Editor
+editor.dbdata.description = Tabellendaten
+editor.dbdata.name        = Daten
+
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = Spalten
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = Name
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name       = Typ
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_es.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_es.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f8e275a007943e8d3600fd1511f9104d24ae9a38
--- /dev/null
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_es.properties
@@ -0,0 +1,3 @@
+editor.lob.name = Editor LOB
+editor.dbdata.name = Datos
+editor.dbdata.description = Tabla de datos
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_fr.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_fr.properties
index 757e6dd651e4f999945243fd1dd87b2be30461af..b4a4bb5098b6b86806007c1f252e1573ab1fa110 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_fr.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_fr.properties
@@ -1,3 +1,4 @@
+extension-point.org.jkiss.dbeaver.dataManager.name = Gestionnaires de donn\u00E9es
 extension-point.org.jkiss.dbeaver.resultset.presentation.name = Pr\u00E9sentations des jeux de r\u00E9sultats
 extension-point.org.jkiss.dbeaver.resultset.panel.name = Panneaux de jeux de r\u00E9sultats
 
@@ -13,6 +14,10 @@ panel.results-metadata.description = Description des mu00E9tadonnu00E9es des jeu
 panel.results-grouping.label = Regroupement
 panel.results-grouping.description = Regroupement des ru00E9sultats (GROUP BY)
 
+editor.lob.name           = Editeur de gros objets
+editor.dbdata.description = Donn\u00E9es en table
+editor.dbdata.name        = Donn\u00E9es
+
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name                  = Colonnes
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name                     = Nom
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name                     = Type
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_it.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_it.properties
new file mode 100644
index 0000000000000000000000000000000000000000..5e86004b41a746397696bd6726f0beb1f99c2828
--- /dev/null
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_it.properties
@@ -0,0 +1,3 @@
+editor.lob.name = Editor Oggetto Grande
+editor.dbdata.name = Dati
+editor.dbdata.description = Tabella dati
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ja.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ja.properties
index 115e47f2499d694421bd7af7cb1f7c2b90e98848..42f369af69595b51aacf6db78591818c23340a06 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ja.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ja.properties
@@ -1,3 +1,4 @@
+extension-point.org.jkiss.dbeaver.dataManager.name =\u30C7\u30FC\u30BF\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC
 extension-point.org.jkiss.dbeaver.resultset.presentation.name =\u7D50\u679C\u30BB\u30C3\u30C8\u306E\u30D7\u30EC\u30BC\u30F3\u30C6\u30FC\u30B7\u30E7\u30F3
 extension-point.org.jkiss.dbeaver.resultset.panel.name =\u7D50\u679C\u30BB\u30C3\u30C8\u30D1\u30CD\u30EB
 
@@ -8,6 +9,10 @@ panel.value-view.label =\u5024\u30D3\u30E5\u30FC\u30A2
 panel.column-aggregate.label =\u5217\u306E\u96C6\u8A08
 panel.results-metadata.label =\u30E1\u30BF\u30C7\u30FC\u30BF
 
+editor.lob.name=\u30E9\u30FC\u30B8\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30A8\u30C7\u30A3\u30BF
+editor.dbdata.name=\u30C7\u30FC\u30BF
+editor.dbdata.description=\u30C6\u30FC\u30D6\u30EB\u30C7\u30FC\u30BF
+
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name=\u30BF\u30A4\u30D7
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name=\u540D
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name=\u5217
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ru.properties
index 814983ae5fc146f6ec3e2d04934c0d9634f93881..212516a285d200039bc00abaeab520ae0616af16 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_ru.properties
@@ -1,3 +1,7 @@
+editor.lob.name           = Large Object Editor
+editor.dbdata.description = \u0414\u0430\u043D\u043D\u044B\u0435 \u0442\u0430\u0431\u043B\u0438\u0446\u044B
+editor.dbdata.name        = \u0414\u0430\u043D\u043D\u044B\u0435
+
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = \u041A\u043E\u043B\u043E\u043D\u043A\u0438
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = \u0418\u043C\u044F
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name       = \u0422\u0438\u043F
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties
index 504edc6fccb286e250b17bedfc28fd9c2441dc3d..3e59daa6a3c3e38d1a7c21867e15d5e57f4f1eb2 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/OSGI-INF/l10n/bundle_zh.properties
@@ -1,3 +1,4 @@
+extension-point.org.jkiss.dbeaver.dataManager.name             = \u6570\u636E\u7BA1\u7406\u5668
 extension-point.org.jkiss.dbeaver.resultset.panel.name         = \u7ED3\u679C\u96C6\u9762\u677F
 extension-point.org.jkiss.dbeaver.resultset.presentation.name  = \u7ED3\u679C\u96C6\u8868\u793A
 
@@ -13,6 +14,10 @@ panel.results-metadata.label       = \u5143\u6570\u636E
 panel.value-view.description       = \u7ED3\u679C\u5355\u5143\u683C\u67E5\u770B\u5668
 panel.value-view.label             = \u6570\u503C\u67E5\u770B\u5668
 
+editor.lob.name           = \u5927\u578B\u5BF9\u8C61\u7F16\u8F91\u5668
+editor.dbdata.description = \u8868\u6570\u636E
+editor.dbdata.name        = \u6570\u636E
+
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.columns.name    = \u5B57\u6BB5
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.name.name       = \u540D\u79F0
 meta.org.jkiss.dbeaver.ui.controls.ColumnInfoPanel$CellKeyInfo.type.name       = \u7C7B\u578B
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml b/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
index 47ab9e7165b7f06c51f1498e252fb4fec79aeda2..88182bea9b4ab17475ec90e8bc83dd74b8a3bc9c 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
@@ -3,6 +3,7 @@
 
 <plugin>
 
+    <extension-point id="org.jkiss.dbeaver.dataManager" name="%extension-point.org.jkiss.dbeaver.dataManager.name" schema="schema/org.jkiss.dbeaver.dataManager.exsd"/>
     <extension-point id="org.jkiss.dbeaver.resultset.presentation" name="%extension-point.org.jkiss.dbeaver.resultset.presentation.name" schema="schema/org.jkiss.dbeaver.resultset.presentation.exsd"/>
     <extension-point id="org.jkiss.dbeaver.resultset.panel" name="%extension-point.org.jkiss.dbeaver.resultset.panel.name" schema="schema/org.jkiss.dbeaver.resultset.panel.exsd"/>
 
@@ -15,6 +16,61 @@
                        description="Plain text" icon="platform:/plugin/org.jkiss.dbeaver.model/icons/types/text.png"/>
     </extension>
 
+    <extension point="org.jkiss.dbeaver.dataManager">
+        <!--
+                <manager class="org.jkiss.dbeaver.ui.data.managers.BooleanValueManager" id="org.jkiss.dbeaver.ui.data.managers.BooleanValueManager">
+                    <supports kind="BOOLEAN"/>
+                </manager>
+        -->
+        <manager class="org.jkiss.dbeaver.ui.data.managers.NumericValueManager" id="org.jkiss.dbeaver.ui.data.managers.NumericValueManager">
+            <supports kind="NUMERIC"/>
+            <supports kind="BOOLEAN"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.StringValueManager" id="org.jkiss.dbeaver.ui.data.managers.StringValueManager">
+            <supports kind="STRING"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.DateTimeValueManager" id="org.jkiss.dbeaver.ui.data.managers.DateTimeValueManager">
+            <supports kind="DATETIME"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.ArrayValueManager" id="org.jkiss.dbeaver.ui.data.managers.ArrayValueManager">
+            <supports kind="ARRAY"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.ReferenceValueManager" id="org.jkiss.dbeaver.ui.data.managers.ReferenceValueManager">
+            <supports kind="REFERENCE"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.StructValueManager" id="org.jkiss.dbeaver.ui.data.managers.StructValueManager">
+            <supports kind="STRUCT"/>
+            <supports type="java.util.Map"/>
+            <supports type="java.util.List"/>
+            <supports type="java.util.Set"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.ContentValueManager" id="org.jkiss.dbeaver.ui.data.managers.ContentValueManager">
+            <supports kind="CONTENT"/>
+            <supports kind="BINARY"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.ObjectValueManager" id="org.jkiss.dbeaver.ui.data.managers.ObjectValueManager">
+            <supports kind="OBJECT"/>
+            <supports kind="DOCUMENT"/>
+            <supports kind="ROWID"/>
+            <supports kind="ANY"/>
+            <supports typeName="REFCURSOR"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.UUIDValueManager" id="org.jkiss.dbeaver.ui.data.managers.UUIDValueManager">
+            <supports type="java.util.UUID"/>
+        </manager>
+        <manager class="org.jkiss.dbeaver.ui.data.managers.URLPreviewValueManager" id="org.jkiss.dbeaver.ui.data.managers.URLPreviewValueManager">
+            <supports typeName="URL.Preview"/>
+        </manager>
+        <!--
+                <manager class="org.jkiss.dbeaver.ui.data.managers.RowIdValueManager" id="org.jkiss.dbeaver.ui.data.managers.RowIdValueManager">
+                    <supports kind="ROWID"/>
+                </manager>
+        -->
+        <manager class="org.jkiss.dbeaver.ui.data.managers.DefaultValueManager" id="DefaultValueManager">
+        </manager>
+
+    </extension>
+
     <extension point="org.jkiss.dbeaver.aggregateFunction">
         <function id="count" class="org.jkiss.dbeaver.model.data.aggregate.FunctionCount" type="simple" label="Count" description="Value count" default="true"/>
         <function id="countDistinct" class="org.jkiss.dbeaver.model.data.aggregate.FunctionCountDistinct" type="simple" label="Count Distinct" description="Value count" default="true"/>
@@ -86,4 +142,42 @@
         </panel>
     </extension>
 
+    <extension point="org.jkiss.dbeaver.databaseEditor">
+        <editor
+                id="org.jkiss.dbeaver.ui.editors.data.DatabaseDataEditor"
+                class="org.jkiss.dbeaver.ui.editors.data.DatabaseDataEditor"
+                objectType="org.jkiss.dbeaver.model.struct.DBSDataContainer"
+                main="false"
+                label="%editor.dbdata.name"
+                description="%editor.dbdata.description"
+                position="additions_start"
+                icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/sql/sql_table.png">
+        </editor>
+    </extension>
+
+    <extension point="org.eclipse.core.expressions.propertyTesters">
+        <propertyTester
+                class="org.jkiss.dbeaver.ui.controls.resultset.ResultSetPropertyTester"
+                id="org.jkiss.dbeaver.ui.controls.resultset.ResultSetPropertyTester"
+                namespace="org.jkiss.dbeaver.core.resultset"
+                properties="active,hasData,hasMoreData,canCopy,canPaste,canCut,canMove,editable,changed,canToggle,canSwitchPresentation,canNavigateLink,canNavigateHistory,supportsCount"
+                type="org.eclipse.ui.IWorkbenchPart"/>
+        <propertyTester
+                class="org.jkiss.dbeaver.ui.controls.resultset.panel.valueviewer.ValueViewPropertyTester"
+                id="org.jkiss.dbeaver.ui.controls.resultset.panel.valueviewer.ValueViewPropertyTester"
+                namespace="org.jkiss.dbeaver.core.resultset.panel.valueView"
+                properties="active"
+                type="org.eclipse.ui.IWorkbenchPart"/>
+    </extension>
+
+    <extension point="org.eclipse.ui.editors">
+        <editor
+                name="%editor.lob.name"
+                icon="platform:/plugin/org.jkiss.dbeaver.ui/icons/misc/binary.png"
+                contributorClass="org.jkiss.dbeaver.ui.editors.content.ContentEditorContributor"
+                class="org.jkiss.dbeaver.ui.editors.content.ContentEditor"
+                id="org.jkiss.dbeaver.ui.editors.content.ContentEditor">
+        </editor>
+    </extension>
+
 </plugin>
diff --git a/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.dataManager.exsd b/plugins/org.jkiss.dbeaver.ui.editors.data/schema/org.jkiss.dbeaver.dataManager.exsd
similarity index 96%
rename from plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.dataManager.exsd
rename to plugins/org.jkiss.dbeaver.ui.editors.data/schema/org.jkiss.dbeaver.dataManager.exsd
index fca3b729c3d3f5eb492f68a2a9977dc8613ab094..8561b240c9af8875d886a10e21450c456851ead5 100644
--- a/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.dataManager.exsd
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/schema/org.jkiss.dbeaver.dataManager.exsd
@@ -1,131 +1,131 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.jkiss.dbeaver.core" id="org.jkiss.dbeaver.dataManager" name="Data Manager"/>
-      </appInfo>
-      <documentation>
-         DBeaver custom data manager
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="manager"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="manager">
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="supports" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.jkiss.dbeaver.model.data.DBDDataTypeProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="supports">
-      <complexType>
-         <attribute name="kind" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="datasource" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.jkiss.dbeaver.core" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.jkiss.dbeaver.core" id="org.jkiss.dbeaver.dataManager" name="Data Manager"/>
+      </appInfo>
+      <documentation>
+         DBeaver custom data manager
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="manager"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="manager">
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="supports" minOccurs="0" maxOccurs="unbounded"/>
+         </sequence>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.jkiss.dbeaver.model.data.DBDDataTypeProvider"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="supports">
+      <complexType>
+         <attribute name="kind" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="datasource" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageDataFormat.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageDataFormat.java
index 9db0cf7b24549dfe842dc8e72a7abccf90ceb6c5..f7882182f6f294116bafe71dc0bb6cef544489e9 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageDataFormat.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageDataFormat.java
@@ -95,7 +95,7 @@ public class PrefPageDataFormat extends TargetPrefPage
     protected void createPreferenceHeader(Composite composite)
     {
         if (!isDataSourcePreferencePage()) {
-            Composite profileGroup = UIUtils.createPlaceholder(composite, 3);
+            Composite profileGroup = UIUtils.createComposite(composite, 3);
             profileGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
             UIUtils.createControlLabel(profileGroup, ResultSetMessages.pref_page_data_format_label_profile);
             profilesCombo = new Combo(profileGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
@@ -124,7 +124,7 @@ public class PrefPageDataFormat extends TargetPrefPage
     {
         boldFont = UIUtils.makeBoldFont(parent.getFont());
 
-        Composite composite = UIUtils.createPlaceholder(parent, 2, 5);
+        Composite composite = UIUtils.createComposite(parent, 2);
 
         // Locale
         {
diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml b/plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml
index f3416cdd87d9b28385c0eee7ce550c82d9f06ad4..441645a159661accb732fa28d714e137e5350e7c 100644
--- a/plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.navigator/plugin.xml
@@ -100,4 +100,19 @@
         <initializer class="org.jkiss.dbeaver.ui.internal.UINavigatorPreferencesInitializer"/>
     </extension>
 
+    <extension point="org.eclipse.core.expressions.propertyTesters">
+        <propertyTester
+                class="org.jkiss.dbeaver.ui.editors.entity.EntityEditorPropertyTester"
+                id="org.jkiss.dbeaver.ui.editors.entity.EntityEditorPropertyTester"
+                namespace="org.jkiss.dbeaver.ui.editors.entity"
+                properties="dirty,canUndo,canRedo"
+                type="org.jkiss.dbeaver.ui.editors.entity.EntityEditor"/>
+        <propertyTester
+                class="org.jkiss.dbeaver.ui.editors.entity.FolderEditorPropertyTester"
+                id="org.jkiss.dbeaver.ui.editors.entity.FolderEditorPropertyTester"
+                namespace="org.jkiss.dbeaver.ui.editors.folder"
+                properties="canNavigate"
+                type="org.jkiss.dbeaver.ui.editors.entity.FolderEditor"/>
+    </extension>
+
 </plugin>