@sapui5/types 1.114.0 → 1.115.0

package/types/sap.ui.vbm.d.ts

@@ -1,4 +1,4 @@
-// For Library Version: 1.114.0
+// For Library Version: 1.115.0
 
 declare module "sap/ui/vbm/library" {
   /**
@@ -92,7 +92,7 @@ declare module "sap/ui/vbm/Adapter" {
   /**
    * Provides the ability to load VBI JSON into {@link sap.ui.vbm.GeoMap sap.ui.vbm.GeoMap} control.
    */
-  export default class Adapter extends UI5Element {
+  class Adapter extends UI5Element {
     /**
      * Constructor for a new GeoMap Adapter.
      *
@@ -173,7 +173,7 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AdapterSubmitEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter` itself
        */
@@ -194,7 +194,7 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AdapterSubmitEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter` itself
        */
@@ -211,7 +211,7 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AdapterSubmitEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -228,9 +228,7 @@ declare module "sap/ui/vbm/Adapter" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        data?: string;
-      }
+      mParameters?: $AdapterSubmitEventParameters
     ): this;
     /**
      * ID of the element which is the current target of the association {@link #getMap map}, or `null`.
@@ -260,6 +258,7 @@ declare module "sap/ui/vbm/Adapter" {
       oMap: ID | GeoMap
     ): this;
   }
+  export default Adapter;
 
   export interface $AdapterSettings extends $ElementSettings {
     /**
@@ -272,7 +271,11 @@ declare module "sap/ui/vbm/Adapter" {
      * The event is raised when a when the Adapter receives an event from GeoMap control. It is intended to
      * unify the various GeoMap events as provided by VBI.
      */
-    submit?: (oEvent: Event) => void;
+    submit?: (oEvent: Event<$AdapterSubmitEventParameters>) => void;
+  }
+
+  export interface $AdapterSubmitEventParameters {
+    data?: string;
   }
 }
 
@@ -290,7 +293,7 @@ declare module "sap/ui/vbm/Adapter3D" {
   /**
    * Provides the ability to load VBI JSON into {@link sap.ui.vbm.Viewport sap.ui.vbm.Viewport} control.
    */
-  export default class Adapter3D extends UI5Element {
+  class Adapter3D extends UI5Element {
     /**
      * Constructor for a new Visual Business Adapter 3D.
      *
@@ -370,7 +373,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$Adapter3DSubmitEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter3D` itself
        */
@@ -390,7 +393,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$Adapter3DSubmitEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Adapter3D` itself
        */
@@ -407,7 +410,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$Adapter3DSubmitEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -424,12 +427,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * A string in the VBI JSON format.
-         */
-        data?: string;
-      }
+      mParameters?: $Adapter3DSubmitEventParameters
     ): this;
     /**
      * ID of the element which is the current target of the association {@link #getViewport viewport}, or `null`.
@@ -461,6 +459,7 @@ declare module "sap/ui/vbm/Adapter3D" {
       oViewport: ID | Viewport
     ): this;
   }
+  export default Adapter3D;
 
   export interface $Adapter3DSettings extends $ElementSettings {
     /**
@@ -472,7 +471,14 @@ declare module "sap/ui/vbm/Adapter3D" {
     /**
      * This event is fired when interactions in the viewport happen.
      */
-    submit?: (oEvent: Event) => void;
+    submit?: (oEvent: Event<$Adapter3DSubmitEventParameters>) => void;
+  }
+
+  export interface $Adapter3DSubmitEventParameters {
+    /**
+     * A string in the VBI JSON format.
+     */
+    data?: string;
   }
 }
 
@@ -498,7 +504,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
    *  By adding Region elements to the regions aggregation it is possible to make feature from the GeoJSON
    * interactive. Region elements need to match by ISO code.
    */
-  export default class AnalyticMap extends GeoMap {
+  class AnalyticMap extends GeoMap {
     /**
      * Constructor for a new AnalyticMap.
      *
@@ -589,7 +595,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AnalyticMapRegionClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -609,7 +615,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AnalyticMapRegionClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -635,7 +641,9 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$AnalyticMapRegionContextMenuEventParameters>
+      ) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -656,7 +664,9 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$AnalyticMapRegionContextMenuEventParameters>
+      ) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.AnalyticMap` itself
        */
@@ -771,7 +781,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AnalyticMapRegionClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -789,7 +799,9 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$AnalyticMapRegionContextMenuEventParameters>
+      ) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -841,12 +853,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * The regions code.
-         */
-        code?: string;
-      }
+      mParameters?: $AnalyticMapRegionClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -859,12 +866,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * The regions code.
-         */
-        code?: string;
-      }
+      mParameters?: $AnalyticMapRegionContextMenuEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -975,6 +977,7 @@ declare module "sap/ui/vbm/AnalyticMap" {
       oCorr: object
     ): void;
   }
+  export default AnalyticMap;
 
   export interface $AnalyticMapSettings extends $GeoMapSettings {
     /**
@@ -986,12 +989,16 @@ declare module "sap/ui/vbm/AnalyticMap" {
     /**
      * The event is raised when there is a click or a tap on a region.
      */
-    regionClick?: (oEvent: Event) => void;
+    regionClick?: (
+      oEvent: Event<$AnalyticMapRegionClickEventParameters>
+    ) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a region.
      */
-    regionContextMenu?: (oEvent: Event) => void;
+    regionContextMenu?: (
+      oEvent: Event<$AnalyticMapRegionContextMenuEventParameters>
+    ) => void;
 
     /**
      * Raised when regions get selected
@@ -1003,6 +1010,24 @@ declare module "sap/ui/vbm/AnalyticMap" {
      */
     regionDeselect?: (oEvent: Event) => void;
   }
+
+  export interface $AnalyticMapRegionClickEventParameters {
+    /**
+     * The regions code.
+     */
+    code?: string;
+  }
+
+  export interface $AnalyticMapRegionContextMenuEventParameters {
+    /**
+     * The regions code.
+     */
+    code?: string;
+  }
+
+  export interface $AnalyticMapRegionDeselectEventParameters {}
+
+  export interface $AnalyticMapRegionSelectEventParameters {}
 }
 
 declare module "sap/ui/vbm/Area" {
@@ -1022,7 +1047,7 @@ declare module "sap/ui/vbm/Area" {
    *  Since the actual size of an area depends on the zoom level it might be only partly visible. Thus detail
    * windows will open at the click position.
    */
-  export default class Area extends VoBase {
+  class Area extends VoBase {
     /**
      * Constructor for a new Area.
      *
@@ -1339,6 +1364,7 @@ declare module "sap/ui/vbm/Area" {
       sPosition?: string
     ): this;
   }
+  export default Area;
 
   export interface $AreaSettings extends $VoBaseSettings {
     /**
@@ -1376,6 +1402,10 @@ declare module "sap/ui/vbm/Area" {
      */
     edgeContextMenu?: (oEvent: Event) => void;
   }
+
+  export interface $AreaEdgeClickEventParameters {}
+
+  export interface $AreaEdgeContextMenuEventParameters {}
 }
 
 declare module "sap/ui/vbm/Areas" {
@@ -1398,7 +1428,7 @@ declare module "sap/ui/vbm/Areas" {
   /**
    * Type specific Visual Object aggregation for Area instances.
    */
-  export default class Areas extends VoAggregation {
+  class Areas extends VoAggregation {
     /**
      * Constructor for a new Areas.
      *
@@ -1489,7 +1519,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AreasEdgeClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1509,7 +1539,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AreasEdgeClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1535,7 +1565,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AreasEdgeContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1556,7 +1586,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AreasEdgeContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Areas` itself
        */
@@ -1579,7 +1609,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AreasEdgeClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -1597,7 +1627,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$AreasEdgeContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -1614,17 +1644,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Clicked instance
-         */
-        instance?: Area;
-        /**
-         * The number of the edge where the click occured. Edges are numbered zero based: e.g. edge from point 1
-         * to point 2 has number 0
-         */
-        edge?: int;
-      }
+      mParameters?: $AreasEdgeClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -1637,17 +1657,7 @@ declare module "sap/ui/vbm/Areas" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Clicked instance
-         */
-        instance?: Area;
-        /**
-         * The number of the edge where the click occured. Edges are numbered zero based: e.g. edge from point 1
-         * to point 2 has number 0
-         */
-        edge?: int;
-      }
+      mParameters?: $AreasEdgeContextMenuEventParameters
     ): this;
     /**
      * Gets content of aggregation {@link #getItems items}.
@@ -1733,6 +1743,7 @@ declare module "sap/ui/vbm/Areas" {
       bPosChangeable?: boolean
     ): this;
   }
+  export default Areas;
 
   export interface $AreasSettings extends $VoAggregationSettings {
     /**
@@ -1749,12 +1760,40 @@ declare module "sap/ui/vbm/Areas" {
     /**
      * This event is raised when the edge of an Area is clicked.
      */
-    edgeClick?: (oEvent: Event) => void;
+    edgeClick?: (oEvent: Event<$AreasEdgeClickEventParameters>) => void;
 
     /**
      * This event is raised when the edge of an Area is right clicked.
      */
-    edgeContextMenu?: (oEvent: Event) => void;
+    edgeContextMenu?: (
+      oEvent: Event<$AreasEdgeContextMenuEventParameters>
+    ) => void;
+  }
+
+  export interface $AreasEdgeClickEventParameters {
+    /**
+     * Clicked instance
+     */
+    instance?: Area;
+
+    /**
+     * The number of the edge where the click occured. Edges are numbered zero based: e.g. edge from point 1
+     * to point 2 has number 0
+     */
+    edge?: int;
+  }
+
+  export interface $AreasEdgeContextMenuEventParameters {
+    /**
+     * Clicked instance
+     */
+    instance?: Area;
+
+    /**
+     * The number of the edge where the click occured. Edges are numbered zero based: e.g. edge from point 1
+     * to point 2 has number 0
+     */
+    edge?: int;
   }
 }
 
@@ -1772,7 +1811,7 @@ declare module "sap/ui/vbm/Box" {
    *  Since the actual size of a box may depend on the zoom level it might be only partly visible. Thus detail
    * windows will open at the click position.
    */
-  export default class Box extends VoBase {
+  class Box extends VoBase {
     /**
      * Constructor for a new Box.
      *
@@ -1942,6 +1981,7 @@ declare module "sap/ui/vbm/Box" {
       sScale?: string
     ): this;
   }
+  export default Box;
 
   export interface $BoxSettings extends $VoBaseSettings {
     /**
@@ -1984,7 +2024,7 @@ declare module "sap/ui/vbm/Boxes" {
   /**
    * Type specific Visual Object aggregation for Box instances.
    */
-  export default class Boxes extends VoAggregation {
+  class Boxes extends VoAggregation {
     /**
      * Constructor for a new Boxes.
      *
@@ -2175,6 +2215,7 @@ declare module "sap/ui/vbm/Boxes" {
       bScaleChangeable?: boolean
     ): this;
   }
+  export default Boxes;
 
   export interface $BoxesSettings extends $VoAggregationSettings {
     /**
@@ -2207,7 +2248,7 @@ declare module "sap/ui/vbm/Circle" {
    * Specific Visual Object element for an Circle. A Circle is positioned with its centerpoint at the
    * given position. The detail window will open at the center of the circle.
    */
-  export default class Circle extends VoBase {
+  class Circle extends VoBase {
     /**
      * Constructor for a new Circle.
      *
@@ -2400,6 +2441,7 @@ declare module "sap/ui/vbm/Circle" {
       sSlices?: string
     ): this;
   }
+  export default Circle;
 
   export interface $CircleSettings extends $VoBaseSettings {
     /**
@@ -2447,7 +2489,7 @@ declare module "sap/ui/vbm/Circles" {
   /**
    * Type specific Visual Object aggregation for Circle elements.
    */
-  export default class Circles extends VoAggregation {
+  class Circles extends VoAggregation {
     /**
      * Constructor for a new Circles.
      *
@@ -2638,6 +2680,7 @@ declare module "sap/ui/vbm/Circles" {
       bRadiusChangeable?: boolean
     ): this;
   }
+  export default Circles;
 
   export interface $CirclesSettings extends $VoAggregationSettings {
     /**
@@ -2680,7 +2723,7 @@ declare module "sap/ui/vbm/Cluster" {
    * defined and may overrule the semantic icon; if no icon is defined ( and no type) then the semantic icon
    * for type inactive is chosen.
    */
-  export default class Cluster extends Control {
+  class Cluster extends Control {
     /**
      * Constructor for a new Cluster.
      *
@@ -2840,6 +2883,7 @@ declare module "sap/ui/vbm/Cluster" {
       sType?: SemanticType | keyof typeof SemanticType
     ): this;
   }
+  export default Cluster;
 
   export interface $ClusterSettings extends $ControlSettings {
     /**
@@ -2873,8 +2917,6 @@ declare module "sap/ui/vbm/ClusterBase" {
 
   import Event from "sap/ui/base/Event";
 
-  import Menu from "sap/ui/unified/Menu";
-
   import { CSSColor } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
@@ -2885,6 +2927,8 @@ declare module "sap/ui/vbm/ClusterBase" {
 
   import ClusterContainer from "sap/ui/vbm/ClusterContainer";
 
+  import Menu from "sap/ui/unified/Menu";
+
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
   /**
@@ -2903,7 +2947,7 @@ declare module "sap/ui/vbm/ClusterBase" {
    * The actual color, font, size, and positioning of the text can be influence via property `textSettings`.
    * For interaction with the cluster you can use the events provided by the spot.
    */
-  export default class ClusterBase extends UI5Element {
+  class ClusterBase extends UI5Element {
     /**
      * Constructor for a new ClusterBase.
      *
@@ -2983,7 +3027,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ClusterBaseClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3003,7 +3047,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ClusterBaseClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3028,7 +3072,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ClusterBaseContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3048,7 +3092,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ClusterBaseContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.ClusterBase` itself
        */
@@ -3077,7 +3121,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ClusterBaseClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -3094,7 +3138,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ClusterBaseContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -3111,12 +3155,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
-         */
-        clusterID?: string;
-      }
+      mParameters?: $ClusterBaseClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -3129,16 +3168,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
-         */
-        clusterID?: string;
-        /**
-         * Menu to open
-         */
-        menu?: Menu;
-      }
+      mParameters?: $ClusterBaseContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getAreaAlwaysVisible areaAlwaysVisible}.
@@ -3372,6 +3402,7 @@ declare module "sap/ui/vbm/ClusterBase" {
       oVizVo: Spot
     ): this;
   }
+  export default ClusterBase;
 
   export interface $ClusterBaseSettings extends $ElementSettings {
     /**
@@ -3420,12 +3451,33 @@ declare module "sap/ui/vbm/ClusterBase" {
     /**
      * The event is raised when there is a click action on a Cluster Object.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$ClusterBaseClickEventParameters>) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a Cluster.
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (
+      oEvent: Event<$ClusterBaseContextMenuEventParameters>
+    ) => void;
+  }
+
+  export interface $ClusterBaseClickEventParameters {
+    /**
+     * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
+     */
+    clusterID?: string;
+  }
+
+  export interface $ClusterBaseContextMenuEventParameters {
+    /**
+     * ID of the clicked cluster object. Can serve as input for GeoMap function getInfoForCluster
+     */
+    clusterID?: string;
+
+    /**
+     * Menu to open
+     */
+    menu?: Menu;
   }
 }
 
@@ -3446,7 +3498,7 @@ declare module "sap/ui/vbm/ClusterContainer" {
    * click may only be fired if the aggregated control is not handling them. The properties are not changeable
    * as well as the aggregated item. Only read access is possible**
    */
-  export default class ClusterContainer extends Container {
+  class ClusterContainer extends Container {
     /**
      * Constructor for a new ClusterContainer.
      *
@@ -3454,8 +3506,8 @@ declare module "sap/ui/vbm/ClusterContainer" {
      * objects as well as event handlers. See {@link sap.ui.base.ManagedObject#constructor} for a general description
      * of the syntax of the settings object.
      *
-     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.vbm.Container#constructor
-     * sap.ui.vbm.Container} can be used.
+     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.vbm.Container#constructor sap.ui.vbm.Container }
+     * can be used.
      */
     constructor(
       /**
@@ -3470,8 +3522,8 @@ declare module "sap/ui/vbm/ClusterContainer" {
      * objects as well as event handlers. See {@link sap.ui.base.ManagedObject#constructor} for a general description
      * of the syntax of the settings object.
      *
-     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.vbm.Container#constructor
-     * sap.ui.vbm.Container} can be used.
+     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.vbm.Container#constructor sap.ui.vbm.Container }
+     * can be used.
      */
     constructor(
       /**
@@ -3514,6 +3566,7 @@ declare module "sap/ui/vbm/ClusterContainer" {
      */
     static getMetadata(): ElementMetadata;
   }
+  export default ClusterContainer;
 
   export interface $ClusterContainerSettings extends $ContainerSettings {}
 }
@@ -3536,7 +3589,7 @@ declare module "sap/ui/vbm/ClusterDistance" {
    * of gravity of the covered objects. Thus the actual distance between them may vary.
    *  This clustering is fast, but the results may not be very convincing.
    */
-  export default class ClusterDistance extends ClusterBase {
+  class ClusterDistance extends ClusterBase {
     /**
      * Constructor for a new ClusterDistance.
      *
@@ -3629,6 +3682,7 @@ declare module "sap/ui/vbm/ClusterDistance" {
       iDistance?: int
     ): this;
   }
+  export default ClusterDistance;
 
   export interface $ClusterDistanceSettings extends $ClusterBaseSettings {
     /**
@@ -3655,7 +3709,7 @@ declare module "sap/ui/vbm/ClusterGrid" {
    * is possible to have multiple grid based clusters. The visualization object is placed in the center of
    * the grid cell plus a given offset.
    */
-  export default class ClusterGrid extends ClusterBase {
+  class ClusterGrid extends ClusterBase {
     /**
      * Constructor for a new ClusterGrid.
      *
@@ -3877,6 +3931,7 @@ declare module "sap/ui/vbm/ClusterGrid" {
       iOrderIndex?: int
     ): this;
   }
+  export default ClusterGrid;
 
   export interface $ClusterGridSettings extends $ClusterBaseSettings {
     /**
@@ -3927,7 +3982,7 @@ declare module "sap/ui/vbm/ClusterTree" {
    * clustering is based on the areas in the Voronoi diagram and cluster objects get aggregated to a hierarchy
    * over several levels of detail.
    */
-  export default class ClusterTree extends ClusterBase {
+  class ClusterTree extends ClusterBase {
     /**
      * Constructor for a new ClusterTree.
      *
@@ -4016,6 +4071,7 @@ declare module "sap/ui/vbm/ClusterTree" {
       bAnimateClusterSplit?: boolean
     ): this;
   }
+  export default ClusterTree;
 
   export interface $ClusterTreeSettings extends $ClusterBaseSettings {
     /**
@@ -4041,7 +4097,7 @@ declare module "sap/ui/vbm/Container" {
    * There is no label, no edit mode, and no drop support. Events like click will only be fired if the aggregated
    * control is not handling them.**
    */
-  export default class Container extends VoBase {
+  class Container extends VoBase {
     /**
      * Constructor for a new Container.
      *
@@ -4180,6 +4236,7 @@ declare module "sap/ui/vbm/Container" {
       sPosition?: string
     ): this;
   }
+  export default Container;
 
   export interface $ContainerSettings extends $VoBaseSettings {
     /**
@@ -4216,7 +4273,7 @@ declare module "sap/ui/vbm/Containers" {
   /**
    * Type specific Visual Object aggregation for Container instances.
    */
-  export default class Containers extends VoAggregation {
+  class Containers extends VoAggregation {
     /**
      * Constructor for a new Containers.
      *
@@ -4349,6 +4406,7 @@ declare module "sap/ui/vbm/Containers" {
       vItem: int | string | Container
     ): Container | null;
   }
+  export default Containers;
 
   export interface $ContainersSettings extends $VoAggregationSettings {
     /**
@@ -4368,7 +4426,7 @@ declare module "sap/ui/vbm/DragSource" {
   /**
    * DragSource Aggregation element
    */
-  export default class DragSource extends UI5Element {
+  class DragSource extends UI5Element {
     /**
      * Constructor for a new DragSource.
      *
@@ -4453,6 +4511,7 @@ declare module "sap/ui/vbm/DragSource" {
       sType?: string
     ): this;
   }
+  export default DragSource;
 
   export interface $DragSourceSettings extends $ElementSettings {
     /**
@@ -4472,7 +4531,7 @@ declare module "sap/ui/vbm/DropTarget" {
   /**
    * DropTarget Aggregation element
    */
-  export default class DropTarget extends UI5Element {
+  class DropTarget extends UI5Element {
     /**
      * Constructor for a new DropTarget.
      *
@@ -4557,6 +4616,7 @@ declare module "sap/ui/vbm/DropTarget" {
       sType?: string
     ): this;
   }
+  export default DropTarget;
 
   export interface $DropTargetSettings extends $ElementSettings {
     /**
@@ -4571,19 +4631,19 @@ declare module "sap/ui/vbm/Feature" {
 
   import Event from "sap/ui/base/Event";
 
-  import Menu from "sap/ui/unified/Menu";
-
   import { CSSColor } from "sap/ui/core/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Menu from "sap/ui/unified/Menu";
+
   /**
    * The Feature element can be added to the items aggregation of a FeatureCollection. By matching
    * the id it allows to redefine the color of a GeoJSON feature and adds interactivity.
    */
-  export default class Feature extends UI5Element {
+  class Feature extends UI5Element {
     /**
      * Constructor for a new Feature.
      *
@@ -4708,7 +4768,7 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$FeatureContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Feature` itself
        */
@@ -4728,7 +4788,7 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$FeatureContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Feature` itself
        */
@@ -4762,7 +4822,7 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$FeatureContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -4792,12 +4852,7 @@ declare module "sap/ui/vbm/Feature" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Menu object to be used with openContextMenu().
-         */
-        menu?: Menu;
-      }
+      mParameters?: $FeatureContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getColor color}.
@@ -4872,6 +4927,7 @@ declare module "sap/ui/vbm/Feature" {
       sFeatureId?: string
     ): this;
   }
+  export default Feature;
 
   export interface $FeatureSettings extends $ElementSettings {
     /**
@@ -4892,7 +4948,16 @@ declare module "sap/ui/vbm/Feature" {
     /**
      * The event is raised when there is a right click or a tap and hold action on a Feature.
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (oEvent: Event<$FeatureContextMenuEventParameters>) => void;
+  }
+
+  export interface $FeatureClickEventParameters {}
+
+  export interface $FeatureContextMenuEventParameters {
+    /**
+     * Menu object to be used with openContextMenu().
+     */
+    menu?: Menu;
   }
 }
 
@@ -4900,6 +4965,8 @@ declare module "sap/ui/vbm/FeatureCollection" {
   import {
     default as GeoJsonLayer,
     $GeoJsonLayerSettings,
+    $GeoJsonLayerClickEventParameters,
+    $GeoJsonLayerContextMenuEventParameters,
   } from "sap/ui/vbm/GeoJsonLayer";
 
   import Feature from "sap/ui/vbm/Feature";
@@ -4921,7 +4988,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
    *  By adding Feature elements to the items aggregation you can make the match (by id) feature from
    * the GeoJSON interactive and give it alternative colors.
    */
-  export default class FeatureCollection extends GeoJsonLayer {
+  class FeatureCollection extends GeoJsonLayer {
     /**
      * Constructor for a new FeatureCollection.
      *
@@ -5013,7 +5080,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$FeatureCollectionClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5034,7 +5101,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$FeatureCollectionClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5060,7 +5127,9 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$FeatureCollectionContextMenuEventParameters>
+      ) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5081,7 +5150,9 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$FeatureCollectionContextMenuEventParameters>
+      ) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.FeatureCollection` itself
        */
@@ -5104,7 +5175,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$FeatureCollectionClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -5121,7 +5192,9 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$FeatureCollectionContextMenuEventParameters>
+      ) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -5138,12 +5211,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Id of clicked Feature
-         */
-        featureId?: string;
-      }
+      mParameters?: $FeatureCollectionClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -5156,12 +5224,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Id of clicked Feature
-         */
-        featureId?: string;
-      }
+      mParameters?: $FeatureCollectionContextMenuEventParameters
     ): this;
     /**
      * Returns Properties for Features like name, bounding box, and midpoint
@@ -5231,6 +5294,7 @@ declare module "sap/ui/vbm/FeatureCollection" {
       vItem: int | string | Feature
     ): Feature | null;
   }
+  export default FeatureCollection;
 
   export interface $FeatureCollectionSettings extends $GeoJsonLayerSettings {
     /**
@@ -5242,14 +5306,22 @@ declare module "sap/ui/vbm/FeatureCollection" {
      * The event is raised when there is a click action on an aggregated Feature. Clicks on other Features from
      * the GeoJSON are ignored.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$FeatureCollectionClickEventParameters>) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on an aggregated Feature. Clicks
      * on other Features from the GeoJSON are ignored.
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (
+      oEvent: Event<$FeatureCollectionContextMenuEventParameters>
+    ) => void;
   }
+
+  export interface $FeatureCollectionClickEventParameters
+    extends $GeoJsonLayerClickEventParameters {}
+
+  export interface $FeatureCollectionContextMenuEventParameters
+    extends $GeoJsonLayerContextMenuEventParameters {}
 }
 
 declare module "sap/ui/vbm/GeoCircle" {
@@ -5264,7 +5336,7 @@ declare module "sap/ui/vbm/GeoCircle" {
    * at the given position. Since the actual size of a geocircle may depend on the zoom level it might
    * be only partly visible. Thus detail windows will open at the click position.
    */
-  export default class GeoCircle extends VoBase {
+  class GeoCircle extends VoBase {
     /**
      * Constructor for a new GeoCircle.
      *
@@ -5461,6 +5533,7 @@ declare module "sap/ui/vbm/GeoCircle" {
       sSlices?: string
     ): this;
   }
+  export default GeoCircle;
 
   export interface $GeoCircleSettings extends $VoBaseSettings {
     /**
@@ -5508,7 +5581,7 @@ declare module "sap/ui/vbm/GeoCircles" {
   /**
    * Type specific Visual Object aggregation for GeoCircle elements.
    */
-  export default class GeoCircles extends VoAggregation {
+  class GeoCircles extends VoAggregation {
     /**
      * Constructor for a new GeoCircles.
      *
@@ -5699,6 +5772,7 @@ declare module "sap/ui/vbm/GeoCircles" {
       bRadiusChangeable?: boolean
     ): this;
   }
+  export default GeoCircles;
 
   export interface $GeoCirclesSettings extends $VoAggregationSettings {
     /**
@@ -5749,7 +5823,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
    *  The GeoJSON can be given as a URL using property srcURL, directly as object using property data,
    * or as a combination of both.
    */
-  export default class GeoJsonLayer extends UI5Element {
+  class GeoJsonLayer extends UI5Element {
     /**
      * Constructor for a new GeoJsonLayer.
      *
@@ -5850,7 +5924,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoJsonLayerClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -5871,7 +5945,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoJsonLayerClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -5897,7 +5971,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoJsonLayerContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -5918,7 +5992,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoJsonLayerContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoJsonLayer` itself
        */
@@ -5941,7 +6015,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoJsonLayerClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -5958,7 +6032,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoJsonLayerContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -5975,12 +6049,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Id of clicked Feature
-         */
-        featureId?: string;
-      }
+      mParameters?: $GeoJsonLayerClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -5993,17 +6062,12 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Id of clicked Feature
-         */
-        featureId?: string;
-      }
+      mParameters?: $GeoJsonLayerContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getData data}.
      *
-     * GeoJSON object according to the {@link http://geojson.org/geojson-spec.html#geojson-objects|specification}
+     * GeoJSON object according to the {@link http://geojson.org/geojson-spec.html#geojson-objects|specification }
      * or array of such objects
      *
      * @returns Value of property `data`
@@ -6156,7 +6220,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
     /**
      * Sets a new value for property {@link #getData data}.
      *
-     * GeoJSON object according to the {@link http://geojson.org/geojson-spec.html#geojson-objects|specification}
+     * GeoJSON object according to the {@link http://geojson.org/geojson-spec.html#geojson-objects|specification }
      * or array of such objects
      *
      * When called with a value of `null` or `undefined`, the default value of the property will be restored.
@@ -6236,6 +6300,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
       sSrcURL?: string
     ): this;
   }
+  export default GeoJsonLayer;
 
   export interface $GeoJsonLayerSettings extends $ElementSettings {
     /**
@@ -6244,7 +6309,7 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
     srcURL?: string | PropertyBindingInfo;
 
     /**
-     * GeoJSON object according to the {@link http://geojson.org/geojson-spec.html#geojson-objects|specification}
+     * GeoJSON object according to the {@link http://geojson.org/geojson-spec.html#geojson-objects|specification }
      * or array of such objects
      */
     data?: object | PropertyBindingInfo | `{${string}}`;
@@ -6273,13 +6338,29 @@ declare module "sap/ui/vbm/GeoJsonLayer" {
      * The event is raised when there is a click action on an aggregated Feature. Clicks on other Features from
      * the GeoJSON are ignored.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$GeoJsonLayerClickEventParameters>) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on an aggregated Feature. Clicks
      * on other Features from the GeoJSON are ignored.
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (
+      oEvent: Event<$GeoJsonLayerContextMenuEventParameters>
+    ) => void;
+  }
+
+  export interface $GeoJsonLayerClickEventParameters {
+    /**
+     * Id of clicked Feature
+     */
+    featureId?: string;
+  }
+
+  export interface $GeoJsonLayerContextMenuEventParameters {
+    /**
+     * Id of clicked Feature
+     */
+    featureId?: string;
   }
 }
 
@@ -6327,7 +6408,7 @@ declare module "sap/ui/vbm/GeoMap" {
    * an arbitrary number of VO aggregations can be assigned to the vos aggregation.
    *  The second aggregation featureCollections allows the use of GeoJSON as source for visual objects.
    */
-  export default class GeoMap extends VBI {
+  class GeoMap extends VBI {
     /**
      * Constructor for a new GeoMap.
      *
@@ -6465,7 +6546,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapCenterChangedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6485,7 +6566,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapCenterChangedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6510,7 +6591,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6530,7 +6611,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6555,7 +6636,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6575,7 +6656,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6600,7 +6681,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapDropEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6620,7 +6701,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapDropEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6645,7 +6726,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyDownEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6665,7 +6746,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyDownEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6690,7 +6771,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyPressEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6710,7 +6791,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyPressEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6735,7 +6816,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyUpEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6755,7 +6836,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyUpEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6825,7 +6906,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapZoomChangedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6845,7 +6926,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapZoomChangedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.GeoMap` itself
        */
@@ -6906,7 +6987,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapCenterChangedEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -6923,7 +7004,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -6940,7 +7021,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -6957,7 +7038,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapDropEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -6974,7 +7055,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyDownEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -6991,7 +7072,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyPressEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7008,7 +7089,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapKeyUpEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7042,7 +7123,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$GeoMapZoomChangedEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -7059,20 +7140,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Center point of the map. Format : Lon;Lat;0.0.
-         */
-        centerPoint?: string;
-        /**
-         * Viewport bounding box's upperLeft and lowerRight coordinates. Format : Lon;Lat;0.0.
-         */
-        viewportBB?: object;
-        /**
-         * Level of detail.
-         */
-        zoomLevel?: int;
-      }
+      mParameters?: $GeoMapCenterChangedEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -7085,12 +7153,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Geo coordinates in format "<longitude>;<latitude>;0"
-         */
-        pos?: string;
-      }
+      mParameters?: $GeoMapClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -7103,20 +7166,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Client coordinate X
-         */
-        clientX?: int;
-        /**
-         * Client coordinate Y
-         */
-        clientY?: int;
-        /**
-         * Geo coordinates in format "<longitude>;<latitude>;0"
-         */
-        pos?: string;
-      }
+      mParameters?: $GeoMapContextMenuEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -7129,12 +7179,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Geo coordinates in format "<longitude>;<latitude>;0"
-         */
-        pos?: string;
-      }
+      mParameters?: $GeoMapDropEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -7147,32 +7192,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Key value of the key
-         */
-        key?: string;
-        /**
-         * Code value of the key
-         */
-        code?: int;
-        /**
-         * Shift key modifier state
-         */
-        shift?: boolean;
-        /**
-         * Ctrl key modifier state
-         */
-        ctrl?: boolean;
-        /**
-         * Alt key modifier state
-         */
-        alt?: boolean;
-        /**
-         * Meta key modifier state
-         */
-        meta?: boolean;
-      }
+      mParameters?: $GeoMapKeyDownEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -7185,32 +7205,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Key value of the key
-         */
-        key?: string;
-        /**
-         * Code value of the key
-         */
-        code?: int;
-        /**
-         * Shift key modifier state
-         */
-        shift?: boolean;
-        /**
-         * Ctrl key modifier state
-         */
-        ctrl?: boolean;
-        /**
-         * Alt key modifier state
-         */
-        alt?: boolean;
-        /**
-         * Meta key modifier state
-         */
-        meta?: boolean;
-      }
+      mParameters?: $GeoMapKeyPressEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -7223,32 +7218,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Key value of the key
-         */
-        key?: string;
-        /**
-         * Code value of the key
-         */
-        code?: int;
-        /**
-         * Shift key modifier state
-         */
-        shift?: boolean;
-        /**
-         * Ctrl key modifier state
-         */
-        ctrl?: boolean;
-        /**
-         * Alt key modifier state
-         */
-        alt?: boolean;
-        /**
-         * Meta key modifier state
-         */
-        meta?: boolean;
-      }
+      mParameters?: $GeoMapKeyUpEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -7274,20 +7244,7 @@ declare module "sap/ui/vbm/GeoMap" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Center point of the map. Format : Lon;Lat;0.0.
-         */
-        centerPoint?: string;
-        /**
-         * Viewport bounding box's upperLeft and lowerRight coordinates. Format : Lon;Lat;0.0.
-         */
-        viewportBB?: object;
-        /**
-         * Level of detail.
-         */
-        zoomLevel?: int;
-      }
+      mParameters?: $GeoMapZoomChangedEventParameters
     ): this;
     /**
      * Retrieves the center position of the current map.
@@ -7525,8 +7482,8 @@ declare module "sap/ui/vbm/GeoMap" {
      * @deprecated (since 1.31) - This aggregation should not longer be used. Its functionality has been replaced
      * by the more generic`geoJsonLayers` aggregation.
      *
-     * Checks for the provided `sap.ui.vbm.FeatureCollection` in the aggregation {@link #getFeatureCollections
-     * featureCollections}. and returns its index if found or -1 otherwise.
+     * Checks for the provided `sap.ui.vbm.FeatureCollection` in the aggregation {@link #getFeatureCollections featureCollections}.
+     * and returns its index if found or -1 otherwise.
      *
      * @returns The index of the provided control in the aggregation if found, or -1 otherwise
      */
@@ -8104,6 +8061,7 @@ declare module "sap/ui/vbm/GeoMap" {
       correlationFactor: float
     ): GeoMap;
   }
+  export default GeoMap;
 
   export interface $GeoMapSettings extends $VBISettings {
     /**
@@ -8230,17 +8188,17 @@ declare module "sap/ui/vbm/GeoMap" {
     /**
      * Raised when the map is clicked.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$GeoMapClickEventParameters>) => void;
 
     /**
      * Raised when the map is right clicked/longPressed(tap and hold).
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (oEvent: Event<$GeoMapContextMenuEventParameters>) => void;
 
     /**
      * Raised when something is dropped on the map.
      */
-    drop?: (oEvent: Event) => void;
+    drop?: (oEvent: Event<$GeoMapDropEventParameters>) => void;
 
     /**
      * This event is raised when a multi selection of visual objects has occurred
@@ -8250,34 +8208,199 @@ declare module "sap/ui/vbm/GeoMap" {
     /**
      * this event is raised on zoom in or zoom out.
      */
-    zoomChanged?: (oEvent: Event) => void;
+    zoomChanged?: (oEvent: Event<$GeoMapZoomChangedEventParameters>) => void;
 
     /**
      * this event is raised on map move.
      */
-    centerChanged?: (oEvent: Event) => void;
+    centerChanged?: (
+      oEvent: Event<$GeoMapCenterChangedEventParameters>
+    ) => void;
 
     /**
      * this event is raised on map key down
      */
-    keyDown?: (oEvent: Event) => void;
+    keyDown?: (oEvent: Event<$GeoMapKeyDownEventParameters>) => void;
 
     /**
      * this event is raised on map key press
      */
-    keyPress?: (oEvent: Event) => void;
+    keyPress?: (oEvent: Event<$GeoMapKeyPressEventParameters>) => void;
 
     /**
      * this event is raised on map key up
      */
-    keyUp?: (oEvent: Event) => void;
+    keyUp?: (oEvent: Event<$GeoMapKeyUpEventParameters>) => void;
   }
-}
 
-declare module "sap/ui/vbm/Heatmap" {
-  import {
-    default as VoAbstract,
-    $VoAbstractSettings,
+  export interface $GeoMapCenterChangedEventParameters {
+    /**
+     * Center point of the map. Format : Lon;Lat;0.0.
+     */
+    centerPoint?: string;
+
+    /**
+     * Viewport bounding box's upperLeft and lowerRight coordinates. Format : Lon;Lat;0.0.
+     */
+    viewportBB?: object;
+
+    /**
+     * Level of detail.
+     */
+    zoomLevel?: int;
+  }
+
+  export interface $GeoMapClickEventParameters {
+    /**
+     * Geo coordinates in format "<longitude>;<latitude>;0"
+     */
+    pos?: string;
+  }
+
+  export interface $GeoMapContextMenuEventParameters {
+    /**
+     * Client coordinate X
+     */
+    clientX?: int;
+
+    /**
+     * Client coordinate Y
+     */
+    clientY?: int;
+
+    /**
+     * Geo coordinates in format "<longitude>;<latitude>;0"
+     */
+    pos?: string;
+  }
+
+  export interface $GeoMapDropEventParameters {
+    /**
+     * Geo coordinates in format "<longitude>;<latitude>;0"
+     */
+    pos?: string;
+  }
+
+  export interface $GeoMapKeyDownEventParameters {
+    /**
+     * Key value of the key
+     */
+    key?: string;
+
+    /**
+     * Code value of the key
+     */
+    code?: int;
+
+    /**
+     * Shift key modifier state
+     */
+    shift?: boolean;
+
+    /**
+     * Ctrl key modifier state
+     */
+    ctrl?: boolean;
+
+    /**
+     * Alt key modifier state
+     */
+    alt?: boolean;
+
+    /**
+     * Meta key modifier state
+     */
+    meta?: boolean;
+  }
+
+  export interface $GeoMapKeyPressEventParameters {
+    /**
+     * Key value of the key
+     */
+    key?: string;
+
+    /**
+     * Code value of the key
+     */
+    code?: int;
+
+    /**
+     * Shift key modifier state
+     */
+    shift?: boolean;
+
+    /**
+     * Ctrl key modifier state
+     */
+    ctrl?: boolean;
+
+    /**
+     * Alt key modifier state
+     */
+    alt?: boolean;
+
+    /**
+     * Meta key modifier state
+     */
+    meta?: boolean;
+  }
+
+  export interface $GeoMapKeyUpEventParameters {
+    /**
+     * Key value of the key
+     */
+    key?: string;
+
+    /**
+     * Code value of the key
+     */
+    code?: int;
+
+    /**
+     * Shift key modifier state
+     */
+    shift?: boolean;
+
+    /**
+     * Ctrl key modifier state
+     */
+    ctrl?: boolean;
+
+    /**
+     * Alt key modifier state
+     */
+    alt?: boolean;
+
+    /**
+     * Meta key modifier state
+     */
+    meta?: boolean;
+  }
+
+  export interface $GeoMapSelectEventParameters {}
+
+  export interface $GeoMapZoomChangedEventParameters {
+    /**
+     * Center point of the map. Format : Lon;Lat;0.0.
+     */
+    centerPoint?: string;
+
+    /**
+     * Viewport bounding box's upperLeft and lowerRight coordinates. Format : Lon;Lat;0.0.
+     */
+    viewportBB?: object;
+
+    /**
+     * Level of detail.
+     */
+    zoomLevel?: int;
+  }
+}
+
+declare module "sap/ui/vbm/Heatmap" {
+  import {
+    default as VoAbstract,
+    $VoAbstractSettings,
   } from "sap/ui/vbm/VoAbstract";
 
   import HeatPoint from "sap/ui/vbm/HeatPoint";
@@ -8292,7 +8415,7 @@ declare module "sap/ui/vbm/Heatmap" {
   /**
    * Type specific Visual Object aggregation for HeatPoint instances.
    */
-  export default class Heatmap extends VoAbstract {
+  class Heatmap extends VoAbstract {
     /**
      * Constructor for a new Heatmap.
      *
@@ -8638,6 +8761,7 @@ declare module "sap/ui/vbm/Heatmap" {
       sValueScale?: string
     ): this;
   }
+  export default Heatmap;
 
   export interface $HeatmapSettings extends $VoAbstractSettings {
     /**
@@ -8705,7 +8829,7 @@ declare module "sap/ui/vbm/HeatPoint" {
   /**
    * Specific Visual Object element for a HeatPoint.
    */
-  export default class HeatPoint extends VoBase {
+  class HeatPoint extends VoBase {
     /**
      * Constructor for a new HeatPoint.
      *
@@ -8840,6 +8964,7 @@ declare module "sap/ui/vbm/HeatPoint" {
       sValue?: string
     ): this;
   }
+  export default HeatPoint;
 
   export interface $HeatPointSettings extends $VoBaseSettings {
     /**
@@ -8877,7 +9002,7 @@ declare module "sap/ui/vbm/Legend" {
    * The Legend is a window in the GeoMap or AnalyticMap control wich can be used to display color/icon-text
    * pairs on a map.
    */
-  export default class Legend extends UI5Element {
+  class Legend extends UI5Element {
     /**
      * Constructor for a new Legend.
      *
@@ -8968,7 +9093,7 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$LegendClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Legend` itself
        */
@@ -8988,7 +9113,7 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$LegendClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Legend` itself
        */
@@ -9011,7 +9136,7 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$LegendClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -9028,32 +9153,7 @@ declare module "sap/ui/vbm/Legend" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Event data object
-         */
-        data?: object;
-        /**
-         * The row number where the click occurred
-         */
-        row?: int;
-        /**
-         * key modifier Ctrl pressed
-         */
-        ctrlKey?: boolean;
-        /**
-         * key modifier Shift pressed
-         */
-        shiftKey?: boolean;
-        /**
-         * key modifier Meta pressed
-         */
-        metaKey?: boolean;
-        /**
-         * key modifier Alt pressed
-         */
-        altKey?: boolean;
-      }
+      mParameters?: $LegendClickEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCaption caption}.
@@ -9137,6 +9237,7 @@ declare module "sap/ui/vbm/Legend" {
       sCaption?: string
     ): this;
   }
+  export default Legend;
 
   export interface $LegendSettings extends $ElementSettings {
     /**
@@ -9152,7 +9253,39 @@ declare module "sap/ui/vbm/Legend" {
     /**
      * The event is raised when there is a click action on a legend.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$LegendClickEventParameters>) => void;
+  }
+
+  export interface $LegendClickEventParameters {
+    /**
+     * Event data object
+     */
+    data?: object;
+
+    /**
+     * The row number where the click occurred
+     */
+    row?: int;
+
+    /**
+     * key modifier Ctrl pressed
+     */
+    ctrlKey?: boolean;
+
+    /**
+     * key modifier Shift pressed
+     */
+    shiftKey?: boolean;
+
+    /**
+     * key modifier Meta pressed
+     */
+    metaKey?: boolean;
+
+    /**
+     * key modifier Alt pressed
+     */
+    altKey?: boolean;
   }
 }
 
@@ -9172,7 +9305,7 @@ declare module "sap/ui/vbm/LegendItem" {
    * is either a rectangle in the given color or the given image or a semantic spot type. If no marker but
    * only a text is provided then it is shown in italic letters and can be regarded as a header.
    */
-  export default class LegendItem extends UI5Element {
+  class LegendItem extends UI5Element {
     /**
      * Constructor for a new LegendItem.
      *
@@ -9252,7 +9385,7 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$LegendItemClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.LegendItem` itself
        */
@@ -9272,7 +9405,7 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$LegendItemClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.LegendItem` itself
        */
@@ -9289,7 +9422,7 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$LegendItemClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -9306,28 +9439,7 @@ declare module "sap/ui/vbm/LegendItem" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Event data object
-         */
-        data?: object;
-        /**
-         * key modifier Ctrl pressed
-         */
-        ctrlKey?: boolean;
-        /**
-         * key modifier Shift pressed
-         */
-        shiftKey?: boolean;
-        /**
-         * key modifier Meta pressed
-         */
-        metaKey?: boolean;
-        /**
-         * key modifier Alt pressed
-         */
-        altKey?: boolean;
-      }
+      mParameters?: $LegendItemClickEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getColor color}.
@@ -9426,6 +9538,7 @@ declare module "sap/ui/vbm/LegendItem" {
       sText?: string
     ): this;
   }
+  export default LegendItem;
 
   export interface $LegendItemSettings extends $ElementSettings {
     /**
@@ -9454,7 +9567,34 @@ declare module "sap/ui/vbm/LegendItem" {
     /**
      * The event is raised when there is a click action on a legend item.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$LegendItemClickEventParameters>) => void;
+  }
+
+  export interface $LegendItemClickEventParameters {
+    /**
+     * Event data object
+     */
+    data?: object;
+
+    /**
+     * key modifier Ctrl pressed
+     */
+    ctrlKey?: boolean;
+
+    /**
+     * key modifier Shift pressed
+     */
+    shiftKey?: boolean;
+
+    /**
+     * key modifier Meta pressed
+     */
+    metaKey?: boolean;
+
+    /**
+     * key modifier Alt pressed
+     */
+    altKey?: boolean;
   }
 }
 
@@ -9478,7 +9618,7 @@ declare module "sap/ui/vbm/Pie" {
    *  The property hotDeltaColor borrowed from VoBase is applied only to the hot PieItem and not the
    * whole pie.
    */
-  export default class Pie extends VoBase {
+  class Pie extends VoBase {
     /**
      * Constructor for a new Pie.
      *
@@ -9659,6 +9799,7 @@ declare module "sap/ui/vbm/Pie" {
       sScale?: string
     ): this;
   }
+  export default Pie;
 
   export interface $PieSettings extends $VoBaseSettings {
     /**
@@ -9691,7 +9832,7 @@ declare module "sap/ui/vbm/PieItem" {
   /**
    * Slice element for a Pie Chart.
    */
-  export default class PieItem extends UI5Element {
+  class PieItem extends UI5Element {
     /**
      * Constructor for a new PieItem.
      *
@@ -9908,6 +10049,7 @@ declare module "sap/ui/vbm/PieItem" {
       sValue?: string
     ): this;
   }
+  export default PieItem;
 
   export interface $PieItemSettings extends $ElementSettings {
     /**
@@ -9931,6 +10073,8 @@ declare module "sap/ui/vbm/PieItem" {
      */
     click?: (oEvent: Event) => void;
   }
+
+  export interface $PieItemClickEventParameters {}
 }
 
 declare module "sap/ui/vbm/Pies" {
@@ -9951,7 +10095,7 @@ declare module "sap/ui/vbm/Pies" {
   /**
    * Type specific Visual Object aggregation for Pie instances.
    */
-  export default class Pies extends VoAggregation {
+  class Pies extends VoAggregation {
     /**
      * Constructor for a new Pies.
      *
@@ -10142,6 +10286,7 @@ declare module "sap/ui/vbm/Pies" {
       bScaleChangeable?: boolean
     ): this;
   }
+  export default Pies;
 
   export interface $PiesSettings extends $VoAggregationSettings {
     /**
@@ -10179,7 +10324,7 @@ declare module "sap/ui/vbm/Region" {
   /**
    * Region properties.
    */
-  export default class Region extends UI5Element {
+  class Region extends UI5Element {
     /**
      * Constructor for a new Region.
      *
@@ -10259,7 +10404,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$RegionClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10279,7 +10424,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$RegionClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10304,7 +10449,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$RegionContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10324,7 +10469,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$RegionContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Region` itself
        */
@@ -10341,7 +10486,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$RegionClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -10358,7 +10503,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$RegionContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -10375,12 +10520,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * The region code.
-         */
-        code?: string;
-      }
+      mParameters?: $RegionClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -10393,12 +10533,7 @@ declare module "sap/ui/vbm/Region" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * The region code.
-         */
-        code?: string;
-      }
+      mParameters?: $RegionContextMenuEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCode code}.
@@ -10599,6 +10734,7 @@ declare module "sap/ui/vbm/Region" {
       bSelect?: boolean
     ): this;
   }
+  export default Region;
 
   export interface $RegionSettings extends $ElementSettings {
     /**
@@ -10639,12 +10775,26 @@ declare module "sap/ui/vbm/Region" {
     /**
      * The event is raised when there is a click action on a region.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$RegionClickEventParameters>) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a region.
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (oEvent: Event<$RegionContextMenuEventParameters>) => void;
+  }
+
+  export interface $RegionClickEventParameters {
+    /**
+     * The region code.
+     */
+    code?: string;
+  }
+
+  export interface $RegionContextMenuEventParameters {
+    /**
+     * The region code.
+     */
+    code?: string;
   }
 }
 
@@ -10662,7 +10812,7 @@ declare module "sap/ui/vbm/Resource" {
    * a Base64 encoded binary. This happens asynchronously and it may require several re-renderings of the
    * control until all resource show up correctly.
    */
-  export default class Resource extends UI5Element {
+  class Resource extends UI5Element {
     /**
      * Constructor for a new Resource.
      *
@@ -10801,6 +10951,7 @@ declare module "sap/ui/vbm/Resource" {
       sValue?: string
     ): this;
   }
+  export default Resource;
 
   export interface $ResourceSettings extends $ElementSettings {
     /**
@@ -10850,7 +11001,7 @@ declare module "sap/ui/vbm/Route" {
    * types defined on element level apply only for a single element instance, except the element is used as
    * template.
    */
-  export default class Route extends VoBase {
+  class Route extends VoBase {
     /**
      * Constructor for a new Route.
      *
@@ -11392,6 +11543,7 @@ declare module "sap/ui/vbm/Route" {
       sStart?: string
     ): this;
   }
+  export default Route;
 
   export interface $RouteSettings extends $VoBaseSettings {
     /**
@@ -11494,6 +11646,9 @@ declare module "sap/ui/vbm/Routes" {
   import {
     default as VoAggregation,
     $VoAggregationSettings,
+    $VoAggregationClickEventParameters,
+    $VoAggregationContextMenuEventParameters,
+    $VoAggregationDropEventParameters,
   } from "sap/ui/vbm/VoAggregation";
 
   import DragSource from "sap/ui/vbm/DragSource";
@@ -11518,7 +11673,7 @@ declare module "sap/ui/vbm/Routes" {
    * visual object matches a type in the drop target aggregation of the target vo. If drag source and drop
    * target types are defined on aggregation level they apply for all aggregated elements.
    */
-  export default class Routes extends VoAggregation {
+  class Routes extends VoAggregation {
     /**
      * Constructor for a new Routes.
      *
@@ -12047,6 +12202,7 @@ declare module "sap/ui/vbm/Routes" {
       bPosChangeable?: boolean
     ): this;
   }
+  export default Routes;
 
   export interface $RoutesSettings extends $VoAggregationSettings {
     /**
@@ -12093,6 +12249,15 @@ declare module "sap/ui/vbm/Routes" {
      */
     drop?: (oEvent: Event) => void;
   }
+
+  export interface $RoutesClickEventParameters
+    extends $VoAggregationClickEventParameters {}
+
+  export interface $RoutesContextMenuEventParameters
+    extends $VoAggregationContextMenuEventParameters {}
+
+  export interface $RoutesDropEventParameters
+    extends $VoAggregationDropEventParameters {}
 }
 
 declare module "sap/ui/vbm/Spot" {
@@ -12115,17 +12280,17 @@ declare module "sap/ui/vbm/Spot" {
    * Specific Visual Object element for a Spot. A Spot is actually an image drawn at the given position.
    * There are two modes for using spots:
    * 	 - A controlled mode by providing a spot type. In this mode many properties for the spot are automatically
-   * 			set by programmed defaults according to the Fiori guidelines.
+   *     set by programmed defaults according to the Fiori guidelines.
    * 	 - A freestyle mode, providing the full control on colors and layout.  Beside the visualization
-   * 			with an image a spot can have an icon or text, which can be controlled and positioned using
-   * 			the content properties.
+   *     with an image a spot can have an icon or text, which can be controlled and positioned using
+   *     the content properties.
    *  A Spot supports GeoMap internal drag'n drop with fine grained control on matching drag sources and drop
    * targets. A drag'n drop operation is possible if any type in the drag source aggregation of the dragged
    * visual object matches a type in the drop target aggregation of the target vo. Drag source and drop target
    * types defined on element level apply only for a single element instance, except the element is used as
    * template.
    */
-  export default class Spot extends VoBase {
+  class Spot extends VoBase {
     /**
      * Constructor for a new Spot.
      *
@@ -12633,6 +12798,7 @@ declare module "sap/ui/vbm/Spot" {
       sType?: SemanticType | keyof typeof SemanticType
     ): this;
   }
+  export default Spot;
 
   export interface $SpotSettings extends $VoBaseSettings {
     /**
@@ -12748,7 +12914,7 @@ declare module "sap/ui/vbm/Spots" {
    * visual object matches a type in the drop target aggregation of the target vo. If drag source and drop
    * target types are defined on aggregation level they apply for all aggregated elements.
    */
-  export default class Spots extends VoAggregation {
+  class Spots extends VoAggregation {
     /**
      * Constructor for a new Spots.
      *
@@ -13081,6 +13247,7 @@ declare module "sap/ui/vbm/Spots" {
       bScaleChangeable?: boolean
     ): this;
   }
+  export default Spots;
 
   export interface $SpotsSettings extends $VoAggregationSettings {
     /**
@@ -13141,11 +13308,11 @@ declare module "sap/ui/vbm/VBI" {
    *  The main or high level API of the VBI control is made of
    * 	 - method load for sending JSON to the control for processing, and
    * 	 - event submit returning a result JSON as parameter data containing actual event information
-   * 			and changed data.  Further the high level API provides the thumbnail support.
+   *     and changed data.  Further the high level API provides the thumbnail support.
    *  Additionally the control offers a low level API made of several events, like render, zoom, move and
    * so on, which allow to render application specific content directly on the controls canvas.
    */
-  export default class VBI extends Control {
+  class VBI extends Control {
     /**
      * Constructor for a new VBI.
      *
@@ -13263,7 +13430,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIChangeTrackingModeEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13284,7 +13451,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIChangeTrackingModeEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13310,7 +13477,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBICloseWindowEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13331,7 +13498,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBICloseWindowEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13358,7 +13525,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIContainerCreatedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13380,7 +13547,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIContainerCreatedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13407,7 +13574,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIContainerDestroyedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13429,7 +13596,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIContainerDestroyedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13454,7 +13621,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIMoveEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13474,7 +13641,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIMoveEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13500,7 +13667,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIOpenWindowEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13521,7 +13688,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIOpenWindowEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13547,7 +13714,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIRenderEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13568,7 +13735,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIRenderEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13593,7 +13760,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBISubmitEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13613,7 +13780,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBISubmitEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13639,7 +13806,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIThumbnailClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13660,7 +13827,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIThumbnailClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13685,7 +13852,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIZoomEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13705,7 +13872,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIZoomEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VBI` itself
        */
@@ -13723,7 +13890,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIChangeTrackingModeEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13740,7 +13907,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBICloseWindowEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13758,7 +13925,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIContainerCreatedEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13776,7 +13943,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIContainerDestroyedEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13793,7 +13960,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIMoveEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13810,7 +13977,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIOpenWindowEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13827,7 +13994,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIRenderEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13844,7 +14011,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBISubmitEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13862,7 +14029,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIThumbnailClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13879,7 +14046,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VBIZoomEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -13896,16 +14063,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * tracking mode to set or reset
-         */
-        mode?: int;
-        /**
-         * set or reset the mode
-         */
-        bSet?: boolean;
-      }
+      mParameters?: $VBIChangeTrackingModeEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -13918,16 +14076,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * DomRef of placeholder Div for content.
-         */
-        contentarea?: object;
-        /**
-         * ID of the window that is closed.
-         */
-        id?: string;
-      }
+      mParameters?: $VBICloseWindowEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -13940,16 +14089,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * DomRef of placeholder Div to render into.
-         */
-        contentarea?: object;
-        /**
-         * ID of the container that was created.
-         */
-        id?: string;
-      }
+      mParameters?: $VBIContainerCreatedEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -13962,16 +14102,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * DomRef of placeholder Div of content.
-         */
-        contentarea?: object;
-        /**
-         * ID of the container that is destroyed.
-         */
-        id?: string;
-      }
+      mParameters?: $VBIContainerDestroyedEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -13984,12 +14115,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Canvas object to render into.
-         */
-        canvas?: object;
-      }
+      mParameters?: $VBIMoveEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -14002,16 +14128,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * DomRef of placeholder Div to render into.
-         */
-        contentarea?: object;
-        /**
-         * ID of the window that is opened.
-         */
-        id?: string;
-      }
+      mParameters?: $VBIOpenWindowEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -14024,12 +14141,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Canvas object to render into.
-         */
-        canvas?: object;
-      }
+      mParameters?: $VBIRenderEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -14042,13 +14154,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * JSON (or possibly XML and case the plugin is used) string describing the delta state of Visual Business
-         * and the information about the event.
-         */
-        data?: string;
-      }
+      mParameters?: $VBISubmitEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -14061,16 +14167,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Geo coordinates in format "lon;lat;0"
-         */
-        pos?: string;
-        /**
-         * Level of detail.
-         */
-        zoomLevel?: int;
-      }
+      mParameters?: $VBIThumbnailClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -14083,12 +14180,7 @@ declare module "sap/ui/vbm/VBI" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Canvas object to render into
-         */
-        canvas?: object;
-      }
+      mParameters?: $VBIZoomEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getAllowKeyEventRepeat allowKeyEventRepeat}.
@@ -14101,8 +14193,7 @@ declare module "sap/ui/vbm/VBI" {
      */
     getAllowKeyEventRepeat(): boolean;
     /**
-     * Returns array of IDs of the elements which are the current targets of the association {@link #getAriaDescribedBy
-     * ariaDescribedBy}.
+     * Returns array of IDs of the elements which are the current targets of the association {@link #getAriaDescribedBy ariaDescribedBy}.
      */
     getAriaDescribedBy(): ID[];
     /**
@@ -14114,8 +14205,7 @@ declare module "sap/ui/vbm/VBI" {
      */
     getAriaLabel(): string;
     /**
-     * Returns array of IDs of the elements which are the current targets of the association {@link #getAriaLabelledBy
-     * ariaLabelledBy}.
+     * Returns array of IDs of the elements which are the current targets of the association {@link #getAriaLabelledBy ariaLabelledBy}.
      */
     getAriaLabelledBy(): ID[];
     /**
@@ -14544,6 +14634,7 @@ declare module "sap/ui/vbm/VBI" {
       iLod: int
     ): void;
   }
+  export default VBI;
 
   export interface $VBISettings extends $ControlSettings {
     /**
@@ -14616,57 +14707,164 @@ declare module "sap/ui/vbm/VBI" {
     /**
      * High level API. Submit event is raised.
      */
-    submit?: (oEvent: Event) => void;
+    submit?: (oEvent: Event<$VBISubmitEventParameters>) => void;
 
     /**
      * High level API. ThumbnailClick event is raised.
      */
-    thumbnailClick?: (oEvent: Event) => void;
+    thumbnailClick?: (oEvent: Event<$VBIThumbnailClickEventParameters>) => void;
 
     /**
      * Low level API. Rendering of the canvas content is reqested. This event can be used to do custom rendering
      * into the Visual Business overlay canvas. This function is not supported in plugin mode.
      */
-    render?: (oEvent: Event) => void;
+    render?: (oEvent: Event<$VBIRenderEventParameters>) => void;
 
     /**
      * Low level API. Tracking mode is set or reset. This function is not supported in plugin mode.
      */
-    changeTrackingMode?: (oEvent: Event) => void;
+    changeTrackingMode?: (
+      oEvent: Event<$VBIChangeTrackingModeEventParameters>
+    ) => void;
 
     /**
      * Low level API. The canvas is zoomed. This function is not supported in plugin mode.
      */
-    zoom?: (oEvent: Event) => void;
+    zoom?: (oEvent: Event<$VBIZoomEventParameters>) => void;
 
     /**
      * Low level API. The canvas was moved. This function is not supported in plugin mode.
      */
-    move?: (oEvent: Event) => void;
+    move?: (oEvent: Event<$VBIMoveEventParameters>) => void;
 
     /**
      * The event is raised before a Visual Business window is opened. It is intended to be used to place arbitrary
      * content in e.g. a Detail Window. This event is not supported in plugin mode.
      */
-    openWindow?: (oEvent: Event) => void;
+    openWindow?: (oEvent: Event<$VBIOpenWindowEventParameters>) => void;
 
     /**
      * The event is raised before a Visual Business window is closed. This function is not supported in plugin
      * mode.
      */
-    closeWindow?: (oEvent: Event) => void;
+    closeWindow?: (oEvent: Event<$VBICloseWindowEventParameters>) => void;
 
     /**
      * The event is raised when a Visual Business container VO instance is created. It is intended to be used
      * to place arbitrary content in e.g. other controls. This event is not supported in plugin mode.
      */
-    containerCreated?: (oEvent: Event) => void;
+    containerCreated?: (
+      oEvent: Event<$VBIContainerCreatedEventParameters>
+    ) => void;
 
     /**
      * The event is raised before a Visual Business container VO instance is destroyed. This function is not
      * supported in plugin mode.
      */
-    containerDestroyed?: (oEvent: Event) => void;
+    containerDestroyed?: (
+      oEvent: Event<$VBIContainerDestroyedEventParameters>
+    ) => void;
+  }
+
+  export interface $VBIChangeTrackingModeEventParameters {
+    /**
+     * tracking mode to set or reset
+     */
+    mode?: int;
+
+    /**
+     * set or reset the mode
+     */
+    bSet?: boolean;
+  }
+
+  export interface $VBICloseWindowEventParameters {
+    /**
+     * DomRef of placeholder Div for content.
+     */
+    contentarea?: object;
+
+    /**
+     * ID of the window that is closed.
+     */
+    id?: string;
+  }
+
+  export interface $VBIContainerCreatedEventParameters {
+    /**
+     * DomRef of placeholder Div to render into.
+     */
+    contentarea?: object;
+
+    /**
+     * ID of the container that was created.
+     */
+    id?: string;
+  }
+
+  export interface $VBIContainerDestroyedEventParameters {
+    /**
+     * DomRef of placeholder Div of content.
+     */
+    contentarea?: object;
+
+    /**
+     * ID of the container that is destroyed.
+     */
+    id?: string;
+  }
+
+  export interface $VBIMoveEventParameters {
+    /**
+     * Canvas object to render into.
+     */
+    canvas?: object;
+  }
+
+  export interface $VBIOpenWindowEventParameters {
+    /**
+     * DomRef of placeholder Div to render into.
+     */
+    contentarea?: object;
+
+    /**
+     * ID of the window that is opened.
+     */
+    id?: string;
+  }
+
+  export interface $VBIRenderEventParameters {
+    /**
+     * Canvas object to render into.
+     */
+    canvas?: object;
+  }
+
+  export interface $VBISubmitEventParameters {
+    /**
+     * JSON (or possibly XML and case the plugin is used) string describing the delta state of Visual Business
+     * and the information about the event.
+     */
+    data?: string;
+  }
+
+  export interface $VBIThumbnailClickEventParameters {
+    /**
+     * Geo coordinates in format "lon;lat;0"
+     */
+    pos?: string;
+
+    /**
+     * Level of detail.
+     */
+    zoomLevel?: int;
+  }
+
+  export interface $VBIZoomEventParameters {
+    /**
+     * Canvas object to render into
+     */
+    canvas?: object;
   }
 }
 
@@ -14684,7 +14882,7 @@ declare module "sap/ui/vbm/Viewport" {
   /**
    * Provides a control for three js canvas.
    */
-  export default class Viewport extends Control {
+  class Viewport extends Control {
     /**
      * Constructor for a new three js viewport for Adapter3D.
      *
@@ -14742,7 +14940,7 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ViewportCameraChangeEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Viewport` itself
        */
@@ -14762,7 +14960,7 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ViewportCameraChangeEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.Viewport` itself
        */
@@ -14779,7 +14977,7 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$ViewportCameraChangeEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -14796,16 +14994,7 @@ declare module "sap/ui/vbm/Viewport" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Current position in camera history
-         */
-        historyPos?: int;
-        /**
-         * Camera history length
-         */
-        historyLength?: int;
-      }
+      mParameters?: $ViewportCameraChangeEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCameraHistoryLength cameraHistoryLength}.
@@ -14912,6 +15101,7 @@ declare module "sap/ui/vbm/Viewport" {
       sWidth?: CSSSize
     ): this;
   }
+  export default Viewport;
 
   export interface $ViewportSettings extends $ControlSettings {
     /**
@@ -14937,7 +15127,21 @@ declare module "sap/ui/vbm/Viewport" {
     /**
      * This event is fired when camera positioning changed (whole movement has been finished)
      */
-    cameraChange?: (oEvent: Event) => void;
+    cameraChange?: (
+      oEvent: Event<$ViewportCameraChangeEventParameters>
+    ) => void;
+  }
+
+  export interface $ViewportCameraChangeEventParameters {
+    /**
+     * Current position in camera history
+     */
+    historyPos?: int;
+
+    /**
+     * Camera history length
+     */
+    historyLength?: int;
   }
 }
 
@@ -14954,7 +15158,7 @@ declare module "sap/ui/vbm/VoAbstract" {
    * Abstract VO aggregation container. This element implements the common part for VOs. It must not be used
    * directly, but is the base for further extension.
    */
-  export default class VoAbstract extends UI5Element {
+  class VoAbstract extends UI5Element {
     /**
      * Constructor for a new VoAbstract.
      *
@@ -14962,8 +15166,8 @@ declare module "sap/ui/vbm/VoAbstract" {
      * objects as well as event handlers. See {@link sap.ui.base.ManagedObject#constructor} for a general description
      * of the syntax of the settings object.
      *
-     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.core.Element#constructor
-     * sap.ui.core.Element} can be used.
+     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.core.Element#constructor sap.ui.core.Element }
+     * can be used.
      */
     constructor(
       /**
@@ -14978,8 +15182,8 @@ declare module "sap/ui/vbm/VoAbstract" {
      * objects as well as event handlers. See {@link sap.ui.base.ManagedObject#constructor} for a general description
      * of the syntax of the settings object.
      *
-     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.core.Element#constructor
-     * sap.ui.core.Element} can be used.
+     * This class does not have its own settings, but all settings applicable to the base type {@link sap.ui.core.Element#constructor sap.ui.core.Element }
+     * can be used.
      */
     constructor(
       /**
@@ -15039,6 +15243,7 @@ declare module "sap/ui/vbm/VoAbstract" {
       oMenu: Menu
     ): void;
   }
+  export default VoAbstract;
 
   export interface $VoAbstractSettings extends $ElementSettings {}
 }
@@ -15051,21 +15256,21 @@ declare module "sap/ui/vbm/VoAggregation" {
 
   import Event from "sap/ui/base/Event";
 
+  import ElementMetadata from "sap/ui/core/ElementMetadata";
+
   import VoBase from "sap/ui/vbm/VoBase";
 
+  import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
+
   import Menu from "sap/ui/unified/Menu";
 
   import Spot from "sap/ui/vbm/Spot";
 
-  import ElementMetadata from "sap/ui/core/ElementMetadata";
-
-  import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
-
   /**
    * Abstract VO aggregation container. This element implements the common part for all specific VO aggregations
    * with selection cardinatities. It must not be used directly, but is the base for further extension.
    */
-  export default class VoAggregation extends VoAbstract {
+  class VoAggregation extends VoAbstract {
     /**
      * Constructor for a new VoAggregation.
      *
@@ -15145,7 +15350,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15165,7 +15370,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15190,7 +15395,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15210,7 +15415,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15235,7 +15440,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationDeselectEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15255,7 +15460,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationDeselectEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15280,7 +15485,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationDropEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15300,7 +15505,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationDropEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15325,7 +15530,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationHandleClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15345,7 +15550,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationHandleClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15371,7 +15576,9 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$VoAggregationHandleContextMenuEventParameters>
+      ) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15392,7 +15599,9 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$VoAggregationHandleContextMenuEventParameters>
+      ) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15417,7 +15626,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationHandleMovedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15437,7 +15646,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationHandleMovedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15462,7 +15671,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationSelectEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15482,7 +15691,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationSelectEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoAggregation` itself
        */
@@ -15499,7 +15708,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15516,7 +15725,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15533,7 +15742,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationDeselectEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15550,7 +15759,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationDropEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15567,7 +15776,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationHandleClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15585,7 +15794,9 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (
+        p1: Event<$VoAggregationHandleContextMenuEventParameters>
+      ) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15602,7 +15813,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationHandleMovedEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15619,7 +15830,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoAggregationSelectEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -15636,12 +15847,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Clicked instance
-         */
-        instance?: VoBase;
-      }
+      mParameters?: $VoAggregationClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -15654,16 +15860,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Clicked instance
-         */
-        instance?: VoBase;
-        /**
-         * Menu to open
-         */
-        menu?: Menu;
-      }
+      mParameters?: $VoAggregationContextMenuEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -15676,12 +15873,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Array of deselected VOs
-         */
-        deselected?: any[];
-      }
+      mParameters?: $VoAggregationDeselectEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -15694,16 +15886,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Drop target instance
-         */
-        instance?: Spot;
-        /**
-         * Dragged instance
-         */
-        dragSource?: VoBase;
-      }
+      mParameters?: $VoAggregationDropEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -15716,16 +15899,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Clicked instance
-         */
-        instance?: VoBase;
-        /**
-         * The number of the handle where the click occured. Handles are numbered zero based.
-         */
-        handle?: int;
-      }
+      mParameters?: $VoAggregationHandleClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -15738,20 +15912,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Clicked instance
-         */
-        instance?: VoBase;
-        /**
-         * Menu to open
-         */
-        menu?: Menu;
-        /**
-         * The number of the handle where the click occured. Handles are numbered zero based.
-         */
-        handle?: int;
-      }
+      mParameters?: $VoAggregationHandleContextMenuEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -15764,16 +15925,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Clicked instance
-         */
-        instance?: VoBase;
-        /**
-         * The number of the handle where the click occured. Handles are numbered zero based.
-         */
-        handle?: int;
-      }
+      mParameters?: $VoAggregationHandleMovedEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -15786,12 +15938,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Array of selected VOs
-         */
-        selected?: any[];
-      }
+      mParameters?: $VoAggregationSelectEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getCustomProperties customProperties}.
@@ -15903,6 +16050,7 @@ declare module "sap/ui/vbm/VoAggregation" {
       sMinSel?: string
     ): this;
   }
+  export default VoAggregation;
 
   export interface $VoAggregationSettings extends $VoAbstractSettings {
     /**
@@ -15924,42 +16072,136 @@ declare module "sap/ui/vbm/VoAggregation" {
     /**
      * This event is raised when a Design handle is moved.
      */
-    handleMoved?: (oEvent: Event) => void;
+    handleMoved?: (
+      oEvent: Event<$VoAggregationHandleMovedEventParameters>
+    ) => void;
 
     /**
      * This event is raised when a Design handle is right clicked.
      */
-    handleContextMenu?: (oEvent: Event) => void;
+    handleContextMenu?: (
+      oEvent: Event<$VoAggregationHandleContextMenuEventParameters>
+    ) => void;
 
     /**
      * This event is raised when a Design handle is clicked.
      */
-    handleClick?: (oEvent: Event) => void;
+    handleClick?: (
+      oEvent: Event<$VoAggregationHandleClickEventParameters>
+    ) => void;
 
     /**
      * This event is raised when aggregated elements get selected
      */
-    select?: (oEvent: Event) => void;
+    select?: (oEvent: Event<$VoAggregationSelectEventParameters>) => void;
 
     /**
      * This event is raised when aggregated elements get deselected
      */
-    deselect?: (oEvent: Event) => void;
+    deselect?: (oEvent: Event<$VoAggregationDeselectEventParameters>) => void;
 
     /**
      * The event is raised when there is a click action on a VO.
      */
-    click?: (oEvent: Event) => void;
+    click?: (oEvent: Event<$VoAggregationClickEventParameters>) => void;
 
     /**
      * The event is raised when there is a right click or a tap and hold action on a VO.
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (
+      oEvent: Event<$VoAggregationContextMenuEventParameters>
+    ) => void;
 
     /**
      * The event is raised when something is dropped on a VO.
      */
-    drop?: (oEvent: Event) => void;
+    drop?: (oEvent: Event<$VoAggregationDropEventParameters>) => void;
+  }
+
+  export interface $VoAggregationClickEventParameters {
+    /**
+     * Clicked instance
+     */
+    instance?: VoBase;
+  }
+
+  export interface $VoAggregationContextMenuEventParameters {
+    /**
+     * Clicked instance
+     */
+    instance?: VoBase;
+
+    /**
+     * Menu to open
+     */
+    menu?: Menu;
+  }
+
+  export interface $VoAggregationDeselectEventParameters {
+    /**
+     * Array of deselected VOs
+     */
+    deselected?: any[];
+  }
+
+  export interface $VoAggregationDropEventParameters {
+    /**
+     * Drop target instance
+     */
+    instance?: Spot;
+
+    /**
+     * Dragged instance
+     */
+    dragSource?: VoBase;
+  }
+
+  export interface $VoAggregationHandleClickEventParameters {
+    /**
+     * Clicked instance
+     */
+    instance?: VoBase;
+
+    /**
+     * The number of the handle where the click occured. Handles are numbered zero based.
+     */
+    handle?: int;
+  }
+
+  export interface $VoAggregationHandleContextMenuEventParameters {
+    /**
+     * Clicked instance
+     */
+    instance?: VoBase;
+
+    /**
+     * Menu to open
+     */
+    menu?: Menu;
+
+    /**
+     * The number of the handle where the click occured. Handles are numbered zero based.
+     */
+    handle?: int;
+  }
+
+  export interface $VoAggregationHandleMovedEventParameters {
+    /**
+     * Clicked instance
+     */
+    instance?: VoBase;
+
+    /**
+     * The number of the handle where the click occured. Handles are numbered zero based.
+     */
+    handle?: int;
+  }
+
+  export interface $VoAggregationSelectEventParameters {
+    /**
+     * Array of selected VOs
+     */
+    selected?: any[];
   }
 }
 
@@ -15968,25 +16210,25 @@ declare module "sap/ui/vbm/VoBase" {
 
   import Event from "sap/ui/base/Event";
 
-  import Menu from "sap/ui/unified/Menu";
-
   import { SemanticType } from "sap/ui/vbm/library";
 
   import ElementMetadata from "sap/ui/core/ElementMetadata";
 
   import { PropertyBindingInfo } from "sap/ui/base/ManagedObject";
 
+  import Menu from "sap/ui/unified/Menu";
+
   /**
    * Abstract aggregation element for VO aggregations. This element implements the common part for all specific
    * VO elements. It must not be used directly, but is the base for further extension.
    *  As a common feature it provides the Label, which may be attached to any visual object. There are two
    * modes for using labels:
    * 	 - A controlled mode by providing a label type. In this mode most parameters for the label are automatically
-   * 			set by programmed defaults according to the Fiori guidelines.
+   *     set by programmed defaults according to the Fiori guidelines.
    * 	 - A freestyle mode, providing the full control on colors and layout.  Further all visual objects
-   * 			have common edit capabilities and it is possible to drop content on visual objects.
+   *     have common edit capabilities and it is possible to drop content on visual objects.
    */
-  export default class VoBase extends UI5Element {
+  class VoBase extends UI5Element {
     /**
      * Constructor for a new VoBase.
      *
@@ -16111,7 +16353,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16131,7 +16373,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16156,7 +16398,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseDropEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16176,7 +16418,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseDropEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16201,7 +16443,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16221,7 +16463,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleClickEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16247,7 +16489,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16268,7 +16510,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleContextMenuEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16293,7 +16535,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleMovedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16313,7 +16555,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleMovedEventParameters>) => void,
       /**
        * Context object to call the event handler with. Defaults to this `sap.ui.vbm.VoBase` itself
        */
@@ -16347,7 +16589,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16364,7 +16606,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseDropEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16381,7 +16623,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleClickEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16399,7 +16641,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleContextMenuEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16416,7 +16658,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * The function to be called, when the event occurs
        */
-      fnFunction: (p1: Event) => void,
+      fnFunction: (p1: Event<$VoBaseHandleMovedEventParameters>) => void,
       /**
        * Context object on which the given function had to be called
        */
@@ -16446,12 +16688,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Menu to open
-         */
-        menu?: Menu;
-      }
+      mParameters?: $VoBaseContextMenuEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -16464,12 +16701,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * Dragged instance
-         */
-        dragSource?: VoBase;
-      }
+      mParameters?: $VoBaseDropEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -16482,12 +16714,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * The number of the handle where the click occured. Handles are numbered zero based.
-         */
-        handle?: int;
-      }
+      mParameters?: $VoBaseHandleClickEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -16500,16 +16727,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * The number of the handle where the click occured. Handles are numbered zero based.
-         */
-        handle?: int;
-        /**
-         * Menu to open
-         */
-        menu?: Menu;
-      }
+      mParameters?: $VoBaseHandleContextMenuEventParameters
     ): this;
     /**
      * @PROTECTED - DO NOT USE IN APPLICATIONS (only for related classes in the framework)
@@ -16522,12 +16740,7 @@ declare module "sap/ui/vbm/VoBase" {
       /**
        * Parameters to pass along with the event
        */
-      mParameters?: {
-        /**
-         * The number of the handle where the click occured. Handles are numbered zero based.
-         */
-        handle?: int;
-      }
+      mParameters?: $VoBaseHandleMovedEventParameters
     ): this;
     /**
      * Gets current value of property {@link #getChangeable changeable}.
@@ -17016,6 +17229,7 @@ declare module "sap/ui/vbm/VoBase" {
       sSelectColor?: string
     ): this;
   }
+  export default VoBase;
 
   export interface $VoBaseSettings extends $ElementSettings {
     /**
@@ -17134,27 +17348,71 @@ declare module "sap/ui/vbm/VoBase" {
     /**
      * The event is raised when there is a right click or a tap and hold action on a visual object.
      */
-    contextMenu?: (oEvent: Event) => void;
+    contextMenu?: (oEvent: Event<$VoBaseContextMenuEventParameters>) => void;
 
     /**
      * This event is raised when the design handle is moved.
      */
-    handleMoved?: (oEvent: Event) => void;
+    handleMoved?: (oEvent: Event<$VoBaseHandleMovedEventParameters>) => void;
 
     /**
      * This event is raised when the design handle is right clicked.
      */
-    handleContextMenu?: (oEvent: Event) => void;
+    handleContextMenu?: (
+      oEvent: Event<$VoBaseHandleContextMenuEventParameters>
+    ) => void;
 
     /**
      * This event is raised when the design handle is clicked.
      */
-    handleClick?: (oEvent: Event) => void;
+    handleClick?: (oEvent: Event<$VoBaseHandleClickEventParameters>) => void;
 
     /**
      * The event is raised when something is dropped on the object.
      */
-    drop?: (oEvent: Event) => void;
+    drop?: (oEvent: Event<$VoBaseDropEventParameters>) => void;
+  }
+
+  export interface $VoBaseClickEventParameters {}
+
+  export interface $VoBaseContextMenuEventParameters {
+    /**
+     * Menu to open
+     */
+    menu?: Menu;
+  }
+
+  export interface $VoBaseDropEventParameters {
+    /**
+     * Dragged instance
+     */
+    dragSource?: VoBase;
+  }
+
+  export interface $VoBaseHandleClickEventParameters {
+    /**
+     * The number of the handle where the click occured. Handles are numbered zero based.
+     */
+    handle?: int;
+  }
+
+  export interface $VoBaseHandleContextMenuEventParameters {
+    /**
+     * The number of the handle where the click occured. Handles are numbered zero based.
+     */
+    handle?: int;
+
+    /**
+     * Menu to open
+     */
+    menu?: Menu;
+  }
+
+  export interface $VoBaseHandleMovedEventParameters {
+    /**
+     * The number of the handle where the click occured. Handles are numbered zero based.
+     */
+    handle?: int;
   }
 }