diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
index 763ccba502635a6c32bc606f03f49c5261af9ef3..6b955788c5632bf3d14652b763dca141ca696805 100644
--- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
@@ -37,7 +37,6 @@ Export-Package: org.jkiss.dbeaver,
  org.jkiss.dbeaver.model.navigator,
  org.jkiss.dbeaver.model.net,
  org.jkiss.dbeaver.model.project,
- org.jkiss.dbeaver.model.properties,
  org.jkiss.dbeaver.model.qm,
  org.jkiss.dbeaver.model.qm.meta,
  org.jkiss.dbeaver.model.runtime,
diff --git a/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.dataManager.exsd b/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.dataManager.exsd
index e7b2039d12db528aa7475edfb2666b26b5e553be..fca3b729c3d3f5eb492f68a2a9977dc8613ab094 100644
--- a/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.dataManager.exsd
+++ b/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.dataManager.exsd
@@ -47,11 +47,10 @@
       </complexType>
    </element>
 
-   <element name="provider">
+   <element name="manager">
       <complexType>
          <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="type" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="datasource" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="supports" minOccurs="0" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="id" type="string" use="required">
             <annotation>
@@ -70,51 +69,19 @@
                </appInfo>
             </annotation>
          </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
       </complexType>
    </element>
 
-   <element name="datasource">
+   <element name="supports">
       <complexType>
-         <attribute name="id" type="string" use="required">
+         <attribute name="kind" type="string">
             <annotation>
                <documentation>
                   
                </documentation>
             </annotation>
          </attribute>
-      </complexType>
-   </element>
-
-   <element name="type">
-      <complexType>
-         <attribute name="standard" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
+         <attribute name="datasource" type="string">
             <annotation>
                <documentation>
                   
diff --git a/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.pluginService.exsd b/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.pluginService.exsd
index d11be5cec96c68383d770491622c6d991fc93329..9d20f4358415a715a1979962651437a34e9defa2 100644
--- a/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.pluginService.exsd
+++ b/plugins/org.jkiss.dbeaver.core/schema/org.jkiss.dbeaver.pluginService.exsd
@@ -37,66 +37,15 @@
       </complexType>
    </element>
 
-   <element name="handler">
+   <element name="service">
       <complexType>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="secured" type="boolean">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="handlerClass" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.jkiss.dbeaver.model.net.DBWNetworkHandler"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="uiClass" type="string">
+         <attribute name="class" type="string">
             <annotation>
                <documentation>
                   
                </documentation>
                <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.jkiss.dbeaver.ui.IObjectPropertyConfigurator"/>
+                  <meta.attribute kind="java" basedOn=":org.jkiss.dbeaver.runtime.IPluginService"/>
                </appInfo>
             </annotation>
          </attribute>