diff --git a/datalets.xml b/datalets.xml
index 50718eb..743fd77 100755
--- a/datalets.xml
+++ b/datalets.xml
@@ -6,6 +6,7 @@
     <components>
         <component>
             <name>datatable-datalet</name>
+            <type>table</type>
             <idm>
                 <inputs>
                     <input>
@@ -169,7 +170,81 @@
             </idm>
         </component>
         <component>
+            <name>donutpie3dchart-datalet</name>
+            <type>pie</type>
+            <idm>
+                <inputs>
+                    <input>
+                        <name>Series</name>
+                        <description>pieSeriesDescription</description>
+                    </input>
+                    <input>
+                        <name>Size</name>
+                        <description>pieSizeDescription</description>
+                    </input>
+                    <layouts>
+                    </layouts>
+                </inputs>
+            </idm>
+        </component>
+        <component>
+            <name>piechart-datalet</name>
+            <type>pie</type>
+            <idm>
+                <inputs>
+                    <input>
+                        <name>Series</name>
+                        <description>pieSeriesDescription</description>
+                    </input>
+                    <input>
+                        <name>Size</name>
+                        <description>pieSizeDescription</description>
+                    </input>
+                    <layouts>
+                    </layouts>
+                </inputs>
+            </idm>
+        </component>
+        <component>
+            <name>treemap-datalet</name>
+            <type>treemap</type>
+            <idm>
+                <inputs>
+                    <input>
+                        <name>Level</name>
+                        <description>levelDescription</description>
+                        <selection>*</selection>
+                    </input>
+                    <layouts>
+                    </layouts>
+                </inputs>
+            </idm>
+        </component>
+        <component>
+            <name>leafletjs-datalet</name>
+            <type>leafletjs</type>
+            <idm>
+                <inputs>
+                    <input>
+                        <name>Latitude</name>
+                        <description>LatitudeDescription</description>
+                    </input>
+                    <input>
+                        <name>Longitude</name>
+                        <description>LongitudeDescription</description>
+                    </input>
+                    <input>
+                        <name>Balloon content</name>
+                        <description>BalloonContentDescription</description>
+                    </input>
+                    <layouts>
+                    </layouts>
+                </inputs>
+            </idm>
+        </component>
+        <component>
             <name>bubble3d-datalet</name>
+            <type>bubble</type>
             <idm>
                 <inputs>
                     <input>
@@ -206,70 +281,109 @@
             </idm>
         </component>
         <component>
-            <name>donutpie3dchart-datalet</name>
-            <type>pie</type>
+            <name>bubblechart-datalet</name>
+            <type>bubble</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Series</name>
-                        <description>pieSeriesDescription</description>
+                        <name>Categories</name>
+                        <description>bubbleCategoriesDescription</description>
                     </input>
                     <input>
-                        <name>Size</name>
-                        <description>pieSizeDescription</description>
+                        <name>Y values</name>
+                        <description>bubbleYValuesDescription</description>
                     </input>
-                    <layouts>
-                    </layouts>
-                </inputs>
-            </idm>
-        </component>
-        <component>
-            <name>piechart-datalet</name>
-            <type>pie</type>
-            <idm>
-                <inputs>
                     <input>
-                        <name>Series</name>
-                        <description>pieSeriesDescription</description>
+                        <name>Z values</name>
+                        <description>bubbleZValuesDescription</description>
                     </input>
                     <input>
-                        <name>Size</name>
-                        <description>pieSizeDescription</description>
+                        <name>Series</name>
+                        <description>bubbleSeriesDescription</description>
                     </input>
                     <layouts>
+                        <input>
+                            <name>x-axis-label</name>
+                            <description>XAxisLabelDescription</description>
+                        </input>
+                        <input>
+                            <name>y-axis-label</name>
+                            <description>YAxisLabelDescription</description>
+                        </input>
+                        <input>
+                            <name>suffix</name>
+                            <description>suffixDescription</description>
+                        </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
         <component>
-            <name>treemap-datalet</name>
+            <name>scatterchart-datalet</name>
+            <type>scatter</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Level</name>
-                        <description>levelDescription</description>
-                        <selection>*</selection>
+                        <name>Categories</name>
+                        <description>scatterCategoriesDescription</description>
+                    </input>
+                    <input>
+                        <name>X values</name>
+                        <description>scatterXValuesDescription</description>
+                    </input>
+                    <input>
+                        <name>Y values</name>
+                        <description>scatterYValuesDescription</description>
                     </input>
                     <layouts>
+                        <input>
+                            <name>x-axis-label</name>
+                            <description>XAxisLabelDescription</description>
+                        </input>
+                        <input>
+                            <name>y-axis-label</name>
+                            <description>YAxisLabelDescription</description>
+                        </input>
+                        <input>
+                            <name>suffix</name>
+                            <description>suffixDescription</description>
+                        </input>
                     </layouts>
                 </inputs>
             </idm>
         </component>
         <component>
-            <name>leafletjs-datalet</name>
+            <name>heatmap-datalet</name>
+            <type>heatmap</type>
             <idm>
                 <inputs>
                     <input>
-                        <name>Latitude</name>
-                        <description>LatitudeDescription</description>
+                        <name>Categories</name>
+                        <description>heatmapCategoriesDescription</description>
                     </input>
                     <input>
-                        <name>Longitude</name>
-                        <description>LongitudeDescription</description>
+                        <name>Series</name>
+                        <description>seriesDescription</description>
                     </input>
                     <input>
-                        <name>Balloon content</name>
-                        <description>BalloonContentDescription</description>
+                        <name>Series</name>
+                        <description>seriesDescription</description>
+                    </input>
+                    <input>
+                        <name>Series</name>
+                        <description>seriesDescription</description>
+                    </input>
+                    <input>
+                        <name>Series</name>
+                        <description>seriesDescription</description>
+                    </input>
+                    <input>
+                        <name>Series</name>
+                        <description>seriesDescription</description>
+                    </input>
+                    <input>
+                        <name>Series</name>
+                        <description>seriesDescription</description>
                     </input>
                     <layouts>
                     </layouts>
diff --git a/datalets/datalets.dtd b/datalets/datalets.dtd
index 1193f85..d5edc5f 100644
--- a/datalets/datalets.dtd
+++ b/datalets/datalets.dtd
@@ -1,17 +1,18 @@
 <!ELEMENT handler_configuration (components)>
 <!ELEMENT components (component*)>
-<!ELEMENT component (name, type?, idm)>
+<!ELEMENT component (name, type, idm)>
 <!--<!ELEMENT component (name, attributes, idm)>-->
 <!--<!ELEMENT attributes (attribute*)>-->
 <!--<!ELEMENT attribute (name)>-->
 <!ELEMENT idm (inputs*)>
 <!ELEMENT inputs (input*, layouts)>
 <!ELEMENT layouts (input*)>
-<!ELEMENT input (name, description?, scale?, role?, selection?, type?, validator?)>
+<!--<!ELEMENT input (name, description?, scale?, role?, selection?, type?, validator?)>-->
+<!ELEMENT input (name, description?, selection?, type?, validator?)>
 <!ELEMENT name (#PCDATA)>
 <!ELEMENT description (#PCDATA)>
-<!ELEMENT scale (#PCDATA)>
-<!ELEMENT role (#PCDATA)>
+<!--<!ELEMENT scale (#PCDATA)>-->
+<!--<!ELEMENT role (#PCDATA)>-->
 <!ELEMENT selection (#PCDATA)>
 <!ELEMENT type (#PCDATA)>
 <!ELEMENT validator (#PCDATA)>