diff --git a/src/z2ui5_cl_xml_view.clas.abap b/src/z2ui5_cl_xml_view.clas.abap
index 5cd462e2..2cb87cff 100644
--- a/src/z2ui5_cl_xml_view.clas.abap
+++ b/src/z2ui5_cl_xml_view.clas.abap
@@ -770,20 +770,26 @@ CLASS z2ui5_cl_xml_view DEFINITION
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view .
     METHODS date_picker
       IMPORTING
-        !value          TYPE clike OPTIONAL
-        !placeholder    TYPE clike OPTIONAL
-        !displayFormat  TYPE clike OPTIONAL
-        !valueFormat    TYPE clike OPTIONAL
-        !required       TYPE clike OPTIONAL
-        !valueState     TYPE clike OPTIONAL
-        !valueStateText TYPE clike OPTIONAL
+        !value                 TYPE clike OPTIONAL
+        !placeholder           TYPE clike OPTIONAL
+        !displayFormat         TYPE clike OPTIONAL
+        !valueFormat           TYPE clike OPTIONAL
+        !required              TYPE clike OPTIONAL
+        !valueState            TYPE clike OPTIONAL
+        !valueStateText        TYPE clike OPTIONAL
+        !enabled               TYPE clike OPTIONAL
+        !showCurrentDateButton TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
         VALUE(result)   TYPE REF TO z2ui5_cl_xml_view .
     METHODS time_picker
       IMPORTING
-        !value        TYPE clike OPTIONAL
-        !placeholder  TYPE clike OPTIONAL
+        !value         TYPE clike OPTIONAL
+        !placeholder   TYPE clike OPTIONAL
+        !enabled       TYPE clike OPTIONAL
+        !valueState    TYPE clike OPTIONAL
+        !displayFormat TYPE clike OPTIONAL
+        !valueFormat   TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view .
@@ -791,6 +797,8 @@ CLASS z2ui5_cl_xml_view DEFINITION
       IMPORTING
         !value        TYPE clike OPTIONAL
         !placeholder  TYPE clike OPTIONAL
+        !enabled      TYPE clike OPTIONAL
+        !valueState   TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view .
@@ -953,6 +961,9 @@ CLASS z2ui5_cl_xml_view DEFINITION
         !min          TYPE clike
         !max          TYPE clike
         !step         TYPE clike
+        !valueState   TYPE clike OPTIONAL
+        !enabled      TYPE clike OPTIONAL
+        !description  TYPE clike OPTIONAL
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_cl_xml_view .
     METHODS progress_indicator
@@ -2226,13 +2237,15 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
   METHOD date_picker.
     result = me.
     _generic( name   = `DatePicker`
-              t_prop = VALUE #( ( n = `value`         v = value )
-                                ( n = `displayFormat` v = displayFormat )
-                                ( n = `valueFormat`   v = valueFormat )
-                                ( n = `required`      v = z2ui5_cl_fw_utility=>get_json_boolean( required ) )
-                                ( n = `valueState`    v = valueState )
-                                ( n = `valueStateText` v = valueStateText )
-                                ( n = `placeholder`   v = placeholder ) ) ).
+              t_prop = VALUE #( ( n = `value`                 v = value )
+                                ( n = `displayFormat`         v = displayFormat )
+                                ( n = `valueFormat`           v = valueFormat )
+                                ( n = `required`              v = z2ui5_cl_fw_utility=>get_json_boolean( required ) )
+                                ( n = `valueState`            v = valueState )
+                                ( n = `valueStateText`        v = valueStateText )
+                                ( n = `placeholder`           v = placeholder )
+                                ( n = `enabled`               v = z2ui5_cl_fw_utility=>get_json_boolean( enabled ) )
+                                ( n = `showCurrentDateButton` v = z2ui5_cl_fw_utility=>get_json_boolean( showCurrentDateButton ) ) ) ).
   ENDMETHOD.
 
 
@@ -2240,7 +2253,9 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
     result = me.
     _generic( name   = `DateTimePicker`
               t_prop = VALUE #( ( n = `value` v = value )
-                                ( n = `placeholder`  v = placeholder ) ) ).
+                                ( n = `placeholder`  v = placeholder )
+                                ( n = `enabled` v = z2ui5_cl_fw_utility=>get_json_boolean( enabled ) )
+                                ( n = `valueState` v = valueState ) ) ).
   ENDMETHOD.
 
 
@@ -3501,7 +3516,10 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
               t_prop = VALUE #( ( n = `max`  v = max )
                                 ( n = `min`  v = min )
                                 ( n = `step` v = step )
-                                ( n = `value` v = value ) ) ).
+                                ( n = `value` v = value )
+                                ( n = `valueState` v = valueState )
+                                ( n = `enabled` v = z2ui5_cl_fw_utility=>get_json_boolean( enabled ) )
+                                ( n = `description` v = description ) ) ).
   ENDMETHOD.
 
 
@@ -3678,7 +3696,11 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
     result = me.
     _generic( name   = `TimePicker`
               t_prop = VALUE #( ( n = `value` v = value )
-                                ( n = `placeholder`  v = placeholder ) ) ).
+                                ( n = `placeholder`  v = placeholder )
+                                ( n = `enabled` v = z2ui5_cl_fw_utility=>get_json_boolean( enabled ) )
+                                ( n = `valueState` v = valueState )
+                                ( n = `displayFormat` v = displayFormat )
+                                ( n = `valueFormat` v = valueFormat ) ) ).
   ENDMETHOD.