diff --git a/steps/20/README.md b/steps/20/README.md
index 1b90b4b7..51521f41 100644
--- a/steps/20/README.md
+++ b/steps/20/README.md
@@ -46,7 +46,7 @@ export default class App extends Controller {
 
 We add the invoice list controller to the view to get access to the view model we defined in the controller. 
 
-We add a price and the currency to our invoices list in the view by adding the `number` attribute to the `ObjectListItem` control, then we apply the currency data type on the number by setting the `type` attribute of the binding syntax to `sap.ui.model.type.Currency`. The `Currency` type will handle the formatting of the price for us, based on the currency code. In our case, the price is displayed with 2 decimals.
+We add a price and the currency to our invoices list in the view by adding the `number` attribute to the `ObjectListItem` control. To apply the currency data type, we use the `require` attribute with the namespace URI `sap.ui.core`, for which the prefix `core` is already defined in our XML view. This allows us to write the attribute as `core:require`. We then add the currency data type module to the list of required modules and assign it the alias `Currency`, making it available for use within the view. Then we set the `type` attribute of the binding syntax to the alias `Currency`. The `Currency` type will handle the formatting of the price for us, based on the currency code. In our case, the price is displayed with 2 decimals.
 
 Additionally, we set the formatting option `showMeasure` to `false`. This hides the currency code in the property `number`. Instead we pass the currency on to the `ObjectListItem` control as a separate property `numberUnit`.
 
@@ -54,6 +54,7 @@ Additionally, we set the formatting option `showMeasure` to `false`. This hides
 <mvc:View
    controllerName="ui5.walkthrough.controller.InvoiceList"
    xmlns="sap.m"
+   xmlns:core="sap.ui.core"
    xmlns:mvc="sap.ui.core.mvc">
    <List
       headerText="{i18n>invoiceListTitle}"
@@ -62,13 +63,16 @@ Additionally, we set the formatting option `showMeasure` to `false`. This hides
       items="{invoice>/Invoices}" >
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice', 
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
@@ -102,6 +106,8 @@ As you can see above, we are using a special binding syntax for the `number` pro
 
 [Formatting, Parsing, and Validating Data](https://sdk.openui5.org/topic/07e4b920f5734fd78fdaa236f26236d8.html "Data that is presented on the UI often has to be converted so that is human readable and fits to the locale of the user. On the other hand, data entered by the user has to be parsed and validated to be understood by the data source. For this purpose, you use formatters and data types.")
 
+[Require Modules in XML View and Fragment](https://sdk.openui5.org/topic/b11d853a8e784db6b2d210ef57b0f7d7.html "Modules can be required in XML views and fragments and assigned to aliases which can be used as variables in properties, event handlers, and bindings.")
+
 [API Reference: sap.ui.base.ManagedObject](https://sdk.openui5.org/api/sap.ui.base.ManagedObject)
 
 [API Reference: sap.ui.base.ManagedObject.PropertyBindingInfo](https://sdk.openui5.org/api/sap.ui.base.ManagedObject.PropertyBindingInfo)
@@ -110,4 +116,4 @@ As you can see above, we are using a special binding syntax for the `number` pro
 
 [API Reference: sap.ui.model.type.Currency](https://sdk.openui5.org/api/sap.ui.model.type.Currency)
 
-[Samples: sap.ui.model.type.Currency](https://sdk.openui5.org/entity/sap.ui.model.type.Currency)
\ No newline at end of file
+[Samples: sap.ui.model.type.Currency](https://sdk.openui5.org/entity/sap.ui.model.type.Currency)
diff --git a/steps/20/webapp/view/InvoiceList.view.xml b/steps/20/webapp/view/InvoiceList.view.xml
index 4fc6e6b8..c9f5529b 100644
--- a/steps/20/webapp/view/InvoiceList.view.xml
+++ b/steps/20/webapp/view/InvoiceList.view.xml
@@ -1,6 +1,7 @@
 <mvc:View
    controllerName="ui5.walkthrough.controller.InvoiceList"
    xmlns="sap.m"
+   xmlns:core="sap.ui.core"
    xmlns:mvc="sap.ui.core.mvc">
    <List
       headerText="{i18n>invoiceListTitle}"
@@ -9,13 +10,16 @@
       items="{invoice>/Invoices}" >
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
-                  'invoice>ExtendedPrice', 
+                  'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
@@ -23,4 +27,4 @@
             numberUnit="{view>/currency}"/>
       </items>
    </List>
-</mvc:View>
\ No newline at end of file
+</mvc:View>
diff --git a/steps/21/README.md b/steps/21/README.md
index 83927afa..79c3b137 100644
--- a/steps/21/README.md
+++ b/steps/21/README.md
@@ -28,6 +28,7 @@ We add the `numberState` attribute to the `ObjectListItem` control in our invoic
 <mvc:View
    controllerName="ui5.walkthrough.controller.InvoiceList"
    xmlns="sap.m"
+   xmlns:core="sap.ui.core"
    xmlns:mvc="sap.ui.core.mvc">
    <List
       headerText="{i18n>invoiceListTitle}"
@@ -36,13 +37,16 @@ We add the `numberState` attribute to the `ObjectListItem` control in our invoic
       items="{invoice>/Invoices}" >
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice', 
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
@@ -78,4 +82,4 @@ Expressions are limited to a particular set of operations that help formatting t
 
 **Related Information**  
 
-[Expression Binding](https://sdk.openui5.org/topic/daf6852a04b44d118963968a1239d2c0.html "Expression binding is an enhancement of the OpenUI5 binding syntax, which allows for providing expressions instead of custom formatter functions.")
\ No newline at end of file
+[Expression Binding](https://sdk.openui5.org/topic/daf6852a04b44d118963968a1239d2c0.html "Expression binding is an enhancement of the OpenUI5 binding syntax, which allows for providing expressions instead of custom formatter functions.")
diff --git a/steps/21/webapp/view/InvoiceList.view.xml b/steps/21/webapp/view/InvoiceList.view.xml
index e61eec92..47298708 100644
--- a/steps/21/webapp/view/InvoiceList.view.xml
+++ b/steps/21/webapp/view/InvoiceList.view.xml
@@ -1,6 +1,7 @@
 <mvc:View
    controllerName="ui5.walkthrough.controller.InvoiceList"
    xmlns="sap.m"
+   xmlns:core="sap.ui.core"
    xmlns:mvc="sap.ui.core.mvc">
    <List
       headerText="{i18n>invoiceListTitle}"
@@ -9,13 +10,16 @@
       items="{invoice>/Invoices}" >
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
-                  'invoice>ExtendedPrice', 
+                  'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
@@ -24,4 +28,4 @@
             numberState="{= ${invoice>ExtendedPrice} > 50 ? 'Error' : 'Success' }"/>
       </items>
    </List>
-</mvc:View>
\ No newline at end of file
+</mvc:View>
diff --git a/steps/22/README.md b/steps/22/README.md
index 5fbdbd71..7ec295be 100644
--- a/steps/22/README.md
+++ b/steps/22/README.md
@@ -97,13 +97,16 @@ We add a status using the `firstStatus` aggregation to our `ObjectListItem` that
       items="{invoice>/Invoices}" >
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice', 
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/22/webapp/view/InvoiceList.view.xml b/steps/22/webapp/view/InvoiceList.view.xml
index edc4f8b9..4a7f3e31 100644
--- a/steps/22/webapp/view/InvoiceList.view.xml
+++ b/steps/22/webapp/view/InvoiceList.view.xml
@@ -10,13 +10,16 @@
       items="{invoice>/Invoices}" >
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/23/webapp/view/InvoiceList.view.xml b/steps/23/webapp/view/InvoiceList.view.xml
index d8a123da..d05caf26 100644
--- a/steps/23/webapp/view/InvoiceList.view.xml
+++ b/steps/23/webapp/view/InvoiceList.view.xml
@@ -17,13 +17,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/24/webapp/view/InvoiceList.view.xml b/steps/24/webapp/view/InvoiceList.view.xml
index 9e3a248b..4c480790 100644
--- a/steps/24/webapp/view/InvoiceList.view.xml
+++ b/steps/24/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/25/webapp/view/InvoiceList.view.xml b/steps/25/webapp/view/InvoiceList.view.xml
index 9e3a248b..4c480790 100644
--- a/steps/25/webapp/view/InvoiceList.view.xml
+++ b/steps/25/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/26/webapp/view/InvoiceList.view.xml b/steps/26/webapp/view/InvoiceList.view.xml
index 9e3a248b..4c480790 100644
--- a/steps/26/webapp/view/InvoiceList.view.xml
+++ b/steps/26/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/27/webapp/view/InvoiceList.view.xml b/steps/27/webapp/view/InvoiceList.view.xml
index 9e3a248b..4c480790 100644
--- a/steps/27/webapp/view/InvoiceList.view.xml
+++ b/steps/27/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/28/webapp/view/InvoiceList.view.xml b/steps/28/webapp/view/InvoiceList.view.xml
index 9e3a248b..4c480790 100644
--- a/steps/28/webapp/view/InvoiceList.view.xml
+++ b/steps/28/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/29/README.md b/steps/29/README.md
index 09bafde0..778f0124 100644
--- a/steps/29/README.md
+++ b/steps/29/README.md
@@ -30,6 +30,7 @@ We introduced a typo in the binding of the number attribute to simulate a freque
 <mvc:View
    controllerName="ui5.walkthrough.controller.InvoiceList"
    xmlns="sap.m"
+   xmlns:core="sap.ui.core"
    xmlns:mvc="sap.ui.core.mvc">
    <List
       id="invoiceList"
@@ -51,13 +52,16 @@ We introduced a typo in the binding of the number attribute to simulate a freque
       </headerToolbar>      
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                 parts: [
                     'invoice>ExTendedPrice',
                     'view>/currency'
                 ],
-                type: 'sap.ui.model.type.Currency',
+                type: 'Currency',
                 formatOptions: {
                     showMeasure: false
                 }
@@ -127,4 +131,4 @@ If you're stuck and need help for some development task, you can also post a que
 
 [Technical Information Dialog](https://sdk.openui5.org/topic/616a3ef07f554e20a3adf749c11f64e9.html#loio616a3ef07f554e20a3adf749c11f64e9 "The Technical Information dialog shows details of the OpenUI5 version currently being used in an app built with OpenUI5. You can use the Technical Information dialog to enable debug resources and open additional support tools to debug your app.")
 
-[UI5 Inspector](https://sdk.openui5.org/topic/b24e72443eb34d0fb7bf6940f2d697eb.html)
\ No newline at end of file
+[UI5 Inspector](https://sdk.openui5.org/topic/b24e72443eb34d0fb7bf6940f2d697eb.html)
diff --git a/steps/29/webapp/view/InvoiceList.view.xml b/steps/29/webapp/view/InvoiceList.view.xml
index 9e3a248b..4c480790 100644
--- a/steps/29/webapp/view/InvoiceList.view.xml
+++ b/steps/29/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/30/README.md b/steps/30/README.md
index abb8e137..0a067559 100644
--- a/steps/30/README.md
+++ b/steps/30/README.md
@@ -258,17 +258,21 @@ In the invoice list view we finally add the press event to the list item we just
 <mvc:View
     controllerName="ui5.walkthrough.controller.InvoiceList"
     xmlns="sap.m"
+    xmlns:core="sap.ui.core"
     xmlns:mvc="sap.ui.core.mvc">
     ...
         <items>
             <ObjectListItem
+                core:require="{
+                    Currency: 'sap/ui/model/type/Currency'
+                }"
                 title="{invoice>Quantity} x {invoice>ProductName}"
                 number="{
                     parts: [
                         'invoice>ExtendedPrice',
                         'view>/currency'
                     ],
-                    type: 'sap.ui.model.type.Currency',
+                    type: 'Currency',
                     formatOptions: {
                         showMeasure: false
                     }
diff --git a/steps/30/webapp/view/InvoiceList.view.xml b/steps/30/webapp/view/InvoiceList.view.xml
index 7598844f..a458ffcb 100644
--- a/steps/30/webapp/view/InvoiceList.view.xml
+++ b/steps/30/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/31/webapp/view/InvoiceList.view.xml b/steps/31/webapp/view/InvoiceList.view.xml
index 7598844f..a458ffcb 100644
--- a/steps/31/webapp/view/InvoiceList.view.xml
+++ b/steps/31/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/32/webapp/view/InvoiceList.view.xml b/steps/32/webapp/view/InvoiceList.view.xml
index 7598844f..a458ffcb 100644
--- a/steps/32/webapp/view/InvoiceList.view.xml
+++ b/steps/32/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/33/webapp/view/InvoiceList.view.xml b/steps/33/webapp/view/InvoiceList.view.xml
index 7598844f..a458ffcb 100644
--- a/steps/33/webapp/view/InvoiceList.view.xml
+++ b/steps/33/webapp/view/InvoiceList.view.xml
@@ -23,13 +23,16 @@
       </headerToolbar>
       <items>
          <ObjectListItem
+            core:require="{
+               Currency: 'sap/ui/model/type/Currency'
+            }"
             title="{invoice>Quantity} x {invoice>ProductName}"
             number="{
                parts: [
                   'invoice>ExtendedPrice',
                   'view>/currency'
                ],
-               type: 'sap.ui.model.type.Currency',
+               type: 'Currency',
                formatOptions: {
                   showMeasure: false
                }
diff --git a/steps/34/README.md b/steps/34/README.md
index dbc04b78..b6e91bbd 100644
--- a/steps/34/README.md
+++ b/steps/34/README.md
@@ -151,24 +151,27 @@ Instead of the `ObjectListItem` that we had before, we will now split the inform
 						number="{invoice>Quantity}"
 						emphasized="false"/>
 					<ObjectIdentifier 
-                        title="{invoice>ProductName}" />
+					  title="{invoice>ProductName}" />
 					<Text
 						text="{
-							    path: 'invoice>Status',
-								formatter: '.formatter.statusText'
-							}"/>
+					    path: 'invoice>Status',
+							formatter: '.formatter.statusText'
+						}"/>
 					<Text text="{invoice>ShipperName}" />
 					<ObjectNumber
+						core:require="{
+							Currency: 'sap/ui/model/type/Currency'
+            }"
 						number="{
-								parts: [
-									'invoice>ExtendedPrice',
-									'view>/currency'
-								],
-								type: 'sap.ui.model.type.Currency',
-								formatOptions: {
-									showMeasure: false
-								}
-							}"
+							parts: [
+								'invoice>ExtendedPrice',
+								'view>/currency'
+							],
+							type: 'Currency',
+							formatOptions: {
+								showMeasure: false
+							}
+						}"
 						unit="{view>/currency}"
 						state="{= ${invoice>ExtendedPrice} > 50 ? 'Error' : 'Success' }"/>
 				</cells>
@@ -203,4 +206,4 @@ We can see the results when we decrease the browser's screen size or open the ap
 
 **Related Information**  
 
-[Configuring Responsive Behavior of a Table](https://sdk.openui5.org/topic/38855e06486f4910bfa6f4485f7c2bac.html "OpenUI5 supports column-based and row-based solutions to support flexible and clearly arranged tables.")
\ No newline at end of file
+[Configuring Responsive Behavior of a Table](https://sdk.openui5.org/topic/38855e06486f4910bfa6f4485f7c2bac.html "OpenUI5 supports column-based and row-based solutions to support flexible and clearly arranged tables.")
diff --git a/steps/34/webapp/view/InvoiceList.view.xml b/steps/34/webapp/view/InvoiceList.view.xml
index ff1fda4d..c08ca3d3 100644
--- a/steps/34/webapp/view/InvoiceList.view.xml
+++ b/steps/34/webapp/view/InvoiceList.view.xml
@@ -67,12 +67,15 @@
 						<Text
 							text="{invoice>ShipperName}"/>
 						<ObjectNumber
+							core:require="{
+								Currency: 'sap/ui/model/type/Currency'
+							}"
 							number="{
 								parts: [
 									'invoice>ExtendedPrice',
 									'view>/currency'
 								],
-								type: 'sap.ui.model.type.Currency',
+								type: 'Currency',
 								formatOptions: {
 									showMeasure: false
 								}
diff --git a/steps/35/README.md b/steps/35/README.md
index 9c5b0255..0422b1cc 100644
--- a/steps/35/README.md
+++ b/steps/35/README.md
@@ -170,6 +170,7 @@ We add the `number` and `numberUnit` field from the list of the previous steps a
 <mvc:View
     controllerName="ui5.walkthrough.controller.Detail"
     xmlns="sap.m"
+    xmlns:core="sap.ui.core"
     xmlns:mvc="sap.ui.core.mvc"
     xmlns:wt="ui5.walkthrough.control">
     <Page
@@ -177,6 +178,10 @@ We add the `number` and `numberUnit` field from the list of the previous steps a
         showNavButton="true"
         navButtonPress=".onNavBack">
         <ObjectHeader
+            core:require="{
+                Date: 'sap/ui/model/type/Date',
+                Currency: 'sap/ui/model/type/Currency'
+            }"
             responsive="true"
             fullScreenOptimized="true"
             number="{
@@ -184,7 +189,7 @@ We add the `number` and `numberUnit` field from the list of the previous steps a
                     'invoice>ExtendedPrice',
                     'view>/currency'
                 ],
-                type: 'sap.ui.model.type.Currency',
+                type: 'Currency',
                 formatOptions: {
                     showMeasure: false
                 }
@@ -200,7 +205,13 @@ We add the `number` and `numberUnit` field from the list of the previous steps a
                     title="{i18n>dateTitle}"
                     text="{
                         path: 'invoice>OrderDate',
-                        type: 'sap.ui.model.type.Date'
+                        type: 'Date',
+                        formatOptions: {
+                            style: 'long',
+                            source: {
+                                pattern: 'yyyy-MM-ddTHH:mm:ss'
+                            }
+                        }
                     }"/>
             </attributes>
         </ObjectHeader>
diff --git a/steps/35/webapp/view/Detail.view.xml b/steps/35/webapp/view/Detail.view.xml
index 542ad9fa..172befcb 100644
--- a/steps/35/webapp/view/Detail.view.xml
+++ b/steps/35/webapp/view/Detail.view.xml
@@ -1,44 +1,55 @@
 <mvc:View
-	controllerName="ui5.walkthrough.controller.Detail"
-	xmlns="sap.m"
-	xmlns:mvc="sap.ui.core.mvc"
-	xmlns:wt="ui5.walkthrough.control">
-	<Page		
-		title="{i18n>detailPageTitle}"
-		showNavButton="true"
-		navButtonPress=".onNavBack">
-		<ObjectHeader
-			responsive="true"
-			fullScreenOptimized="true"
-            number="{
-                parts: [
-                    'invoice>ExtendedPrice',
-                    'view>/currency'
-                ],
-                type: 'sap.ui.model.type.Currency',
-                formatOptions: {
-                    showMeasure: false
+  controllerName="ui5.walkthrough.controller.Detail"
+  xmlns="sap.m"
+  xmlns:core="sap.ui.core"
+  xmlns:mvc="sap.ui.core.mvc"
+  xmlns:wt="ui5.walkthrough.control">
+  <Page
+    title="{i18n>detailPageTitle}"
+    showNavButton="true"
+    navButtonPress=".onNavBack">
+    <ObjectHeader
+      core:require="{
+        Date: 'sap/ui/model/type/Date',
+        Currency: 'sap/ui/model/type/Currency'
+      }"
+      responsive="true"
+      fullScreenOptimized="true"
+      number="{
+        parts: [
+          'invoice>ExtendedPrice',
+          'view>/currency'
+        ],
+        type: 'Currency',
+        formatOptions: {
+          showMeasure: false
+        }
+      }"
+      numberUnit="{view>/currency}"
+      intro="{invoice>ShipperName}"
+      title="{invoice>ProductName}">
+        <attributes>
+          <ObjectAttribute
+            title="{i18n>quantityTitle}"
+            text="{invoice>Quantity}"/>
+          <ObjectAttribute
+            title="{i18n>dateTitle}"
+            text="{
+              path: 'invoice>ShippedDate',
+              type: 'Date',
+              formatOptions: {
+                style: 'long',
+                source: {
+                  pattern: 'yyyy-MM-ddTHH:mm:ss'
                 }
-            }"
-			numberUnit="{view>/currency}"		
-			intro="{invoice>ShipperName}"
-			title="{invoice>ProductName}">
-            <attributes>
-                <ObjectAttribute
-                    title="{i18n>quantityTitle}"
-                    text="{invoice>Quantity}"/>
-                <ObjectAttribute
-                    title="{i18n>dateTitle}"
-                    text="{
-                        path: 'invoice>ShippedDate',
-                        type: 'sap.ui.model.type.Date'
-                    }"/>
-            </attributes>
-		</ObjectHeader>
-		<wt:ProductRating 
-			id="rating"
-			tooltip="{invoice>ProductName}"
-			class="sapUiSmallMarginBeginEnd" 
-			change=".onRatingChange"/>
-	</Page>
-</mvc:View>
\ No newline at end of file
+              }
+            }"/>
+        </attributes>
+    </ObjectHeader>
+    <wt:ProductRating
+      id="rating"
+      tooltip="{invoice>ProductName}"
+      class="sapUiSmallMarginBeginEnd"
+      change=".onRatingChange"/>
+  </Page>
+</mvc:View>
diff --git a/steps/35/webapp/view/InvoiceList.view.xml b/steps/35/webapp/view/InvoiceList.view.xml
index ff1fda4d..268e28b7 100644
--- a/steps/35/webapp/view/InvoiceList.view.xml
+++ b/steps/35/webapp/view/InvoiceList.view.xml
@@ -67,12 +67,15 @@
 						<Text
 							text="{invoice>ShipperName}"/>
 						<ObjectNumber
+						  core:require="{
+						    Currency: 'sap/ui/model/type/Currency'
+						  }"
 							number="{
 								parts: [
 									'invoice>ExtendedPrice',
 									'view>/currency'
 								],
-								type: 'sap.ui.model.type.Currency',
+								type: 'Currency',
 								formatOptions: {
 									showMeasure: false
 								}
diff --git a/steps/36/webapp/view/Detail.view.xml b/steps/36/webapp/view/Detail.view.xml
index 3ac9366d..172befcb 100644
--- a/steps/36/webapp/view/Detail.view.xml
+++ b/steps/36/webapp/view/Detail.view.xml
@@ -1,50 +1,55 @@
 <mvc:View
-	controllerName="ui5.walkthrough.controller.Detail"
-	xmlns="sap.m"
-	xmlns:mvc="sap.ui.core.mvc"
-	xmlns:wt="ui5.walkthrough.control">
-	<Page		
-		title="{i18n>detailPageTitle}"
-		showNavButton="true"
-		navButtonPress=".onNavBack">
-		<ObjectHeader
-			responsive="true"
-			fullScreenOptimized="true"
-			number="{
-                parts: [
-                    'invoice>ExtendedPrice',
-                    'view>/currency'
-                ],
-                type: 'sap.ui.model.type.Currency',
-                formatOptions: {
-                    showMeasure: false
+  controllerName="ui5.walkthrough.controller.Detail"
+  xmlns="sap.m"
+  xmlns:core="sap.ui.core"
+  xmlns:mvc="sap.ui.core.mvc"
+  xmlns:wt="ui5.walkthrough.control">
+  <Page
+    title="{i18n>detailPageTitle}"
+    showNavButton="true"
+    navButtonPress=".onNavBack">
+    <ObjectHeader
+      core:require="{
+        Date: 'sap/ui/model/type/Date',
+        Currency: 'sap/ui/model/type/Currency'
+      }"
+      responsive="true"
+      fullScreenOptimized="true"
+      number="{
+        parts: [
+          'invoice>ExtendedPrice',
+          'view>/currency'
+        ],
+        type: 'Currency',
+        formatOptions: {
+          showMeasure: false
+        }
+      }"
+      numberUnit="{view>/currency}"
+      intro="{invoice>ShipperName}"
+      title="{invoice>ProductName}">
+        <attributes>
+          <ObjectAttribute
+            title="{i18n>quantityTitle}"
+            text="{invoice>Quantity}"/>
+          <ObjectAttribute
+            title="{i18n>dateTitle}"
+            text="{
+              path: 'invoice>ShippedDate',
+              type: 'Date',
+              formatOptions: {
+                style: 'long',
+                source: {
+                  pattern: 'yyyy-MM-ddTHH:mm:ss'
                 }
-			}"
-			numberUnit="{view>/currency}"		
-			intro="{invoice>ShipperName}"
-			title="{invoice>ProductName}">
-			<attributes>
-                <ObjectAttribute
-                    title="{i18n>quantityTitle}"
-                    text="{invoice>Quantity}"/>
-				<ObjectAttribute 
-					title="{i18n>dateTitle}" 
-					text="{
-					path: 'invoice>ShippedDate',
-					type: 'sap.ui.model.type.Date',
-					formatOptions: {
-					  style: 'long',
-					  source: {
-						pattern: 'yyyy-MM-ddTHH:mm:ss'
-					  }
-					}
-				  }"/>
-			</attributes>
-		</ObjectHeader>
-		<wt:ProductRating 
-			id="rating"
-			tooltip="{invoice>ProductName}"
-			class="sapUiSmallMarginBeginEnd" 
-			change=".onRatingChange"/>
-	</Page>
-</mvc:View>
\ No newline at end of file
+              }
+            }"/>
+        </attributes>
+    </ObjectHeader>
+    <wt:ProductRating
+      id="rating"
+      tooltip="{invoice>ProductName}"
+      class="sapUiSmallMarginBeginEnd"
+      change=".onRatingChange"/>
+  </Page>
+</mvc:View>
diff --git a/steps/36/webapp/view/InvoiceList.view.xml b/steps/36/webapp/view/InvoiceList.view.xml
index ff1fda4d..268e28b7 100644
--- a/steps/36/webapp/view/InvoiceList.view.xml
+++ b/steps/36/webapp/view/InvoiceList.view.xml
@@ -67,12 +67,15 @@
 						<Text
 							text="{invoice>ShipperName}"/>
 						<ObjectNumber
+						  core:require="{
+						    Currency: 'sap/ui/model/type/Currency'
+						  }"
 							number="{
 								parts: [
 									'invoice>ExtendedPrice',
 									'view>/currency'
 								],
-								type: 'sap.ui.model.type.Currency',
+								type: 'Currency',
 								formatOptions: {
 									showMeasure: false
 								}
diff --git a/steps/37/webapp/view/Detail.view.xml b/steps/37/webapp/view/Detail.view.xml
index e574fbba..172befcb 100644
--- a/steps/37/webapp/view/Detail.view.xml
+++ b/steps/37/webapp/view/Detail.view.xml
@@ -1,44 +1,55 @@
 <mvc:View
-	controllerName="ui5.walkthrough.controller.Detail"
-	xmlns="sap.m"
-	xmlns:mvc="sap.ui.core.mvc"
-	xmlns:wt="ui5.walkthrough.control">
-	<Page		
-		title="{i18n>detailPageTitle}"
-		showNavButton="true"
-		navButtonPress=".onNavBack">
-		<ObjectHeader
-			responsive="true"
-			fullScreenOptimized="true"
-            number="{
-                parts: [
-                    'invoice>ExtendedPrice',
-                    'view>/currency'
-                ],
-                type: 'sap.ui.model.type.Currency',
-                formatOptions: {
-                    showMeasure: false
+  controllerName="ui5.walkthrough.controller.Detail"
+  xmlns="sap.m"
+  xmlns:core="sap.ui.core"
+  xmlns:mvc="sap.ui.core.mvc"
+  xmlns:wt="ui5.walkthrough.control">
+  <Page
+    title="{i18n>detailPageTitle}"
+    showNavButton="true"
+    navButtonPress=".onNavBack">
+    <ObjectHeader
+      core:require="{
+        Date: 'sap/ui/model/type/Date',
+        Currency: 'sap/ui/model/type/Currency'
+      }"
+      responsive="true"
+      fullScreenOptimized="true"
+      number="{
+        parts: [
+          'invoice>ExtendedPrice',
+          'view>/currency'
+        ],
+        type: 'Currency',
+        formatOptions: {
+          showMeasure: false
+        }
+      }"
+      numberUnit="{view>/currency}"
+      intro="{invoice>ShipperName}"
+      title="{invoice>ProductName}">
+        <attributes>
+          <ObjectAttribute
+            title="{i18n>quantityTitle}"
+            text="{invoice>Quantity}"/>
+          <ObjectAttribute
+            title="{i18n>dateTitle}"
+            text="{
+              path: 'invoice>ShippedDate',
+              type: 'Date',
+              formatOptions: {
+                style: 'long',
+                source: {
+                  pattern: 'yyyy-MM-ddTHH:mm:ss'
                 }
-            }"
-			numberUnit="{view>/currency}"		
-			intro="{invoice>ShipperName}"
-			title="{invoice>ProductName}">
-			<attributes>
-                <ObjectAttribute
-                    title="{i18n>quantityTitle}"
-                    text="{invoice>Quantity}"/>
-                <ObjectAttribute
-                    title="{i18n>dateTitle}"
-                    text="{
-                        path: 'invoice>ShippedDate',
-                        type: 'sap.ui.model.type.Date'
-                    }"/>
-			</attributes>
-		</ObjectHeader>
-		<wt:ProductRating 
-			id="rating"
-			tooltip="{invoice>ProductName}"
-			class="sapUiSmallMarginBeginEnd" 
-			change=".onRatingChange"/>
-	</Page>
-</mvc:View>
\ No newline at end of file
+              }
+            }"/>
+        </attributes>
+    </ObjectHeader>
+    <wt:ProductRating
+      id="rating"
+      tooltip="{invoice>ProductName}"
+      class="sapUiSmallMarginBeginEnd"
+      change=".onRatingChange"/>
+  </Page>
+</mvc:View>
diff --git a/steps/37/webapp/view/InvoiceList.view.xml b/steps/37/webapp/view/InvoiceList.view.xml
index e0b813d4..aec957bd 100644
--- a/steps/37/webapp/view/InvoiceList.view.xml
+++ b/steps/37/webapp/view/InvoiceList.view.xml
@@ -70,12 +70,15 @@
 							<Text
 								text="{invoice>ShipperName}"/>
 							<ObjectNumber
+						    core:require="{
+						      Currency: 'sap/ui/model/type/Currency'
+						    }"
 								number="{
 									parts: [
 										'invoice>ExtendedPrice',
 										'view>/currency'
 									],
-									type: 'sap.ui.model.type.Currency',
+									type: 'Currency',
 									formatOptions: {
 										showMeasure: false
 									}
diff --git a/steps/38/webapp/view/Detail.view.xml b/steps/38/webapp/view/Detail.view.xml
index e574fbba..172befcb 100644
--- a/steps/38/webapp/view/Detail.view.xml
+++ b/steps/38/webapp/view/Detail.view.xml
@@ -1,44 +1,55 @@
 <mvc:View
-	controllerName="ui5.walkthrough.controller.Detail"
-	xmlns="sap.m"
-	xmlns:mvc="sap.ui.core.mvc"
-	xmlns:wt="ui5.walkthrough.control">
-	<Page		
-		title="{i18n>detailPageTitle}"
-		showNavButton="true"
-		navButtonPress=".onNavBack">
-		<ObjectHeader
-			responsive="true"
-			fullScreenOptimized="true"
-            number="{
-                parts: [
-                    'invoice>ExtendedPrice',
-                    'view>/currency'
-                ],
-                type: 'sap.ui.model.type.Currency',
-                formatOptions: {
-                    showMeasure: false
+  controllerName="ui5.walkthrough.controller.Detail"
+  xmlns="sap.m"
+  xmlns:core="sap.ui.core"
+  xmlns:mvc="sap.ui.core.mvc"
+  xmlns:wt="ui5.walkthrough.control">
+  <Page
+    title="{i18n>detailPageTitle}"
+    showNavButton="true"
+    navButtonPress=".onNavBack">
+    <ObjectHeader
+      core:require="{
+        Date: 'sap/ui/model/type/Date',
+        Currency: 'sap/ui/model/type/Currency'
+      }"
+      responsive="true"
+      fullScreenOptimized="true"
+      number="{
+        parts: [
+          'invoice>ExtendedPrice',
+          'view>/currency'
+        ],
+        type: 'Currency',
+        formatOptions: {
+          showMeasure: false
+        }
+      }"
+      numberUnit="{view>/currency}"
+      intro="{invoice>ShipperName}"
+      title="{invoice>ProductName}">
+        <attributes>
+          <ObjectAttribute
+            title="{i18n>quantityTitle}"
+            text="{invoice>Quantity}"/>
+          <ObjectAttribute
+            title="{i18n>dateTitle}"
+            text="{
+              path: 'invoice>ShippedDate',
+              type: 'Date',
+              formatOptions: {
+                style: 'long',
+                source: {
+                  pattern: 'yyyy-MM-ddTHH:mm:ss'
                 }
-            }"
-			numberUnit="{view>/currency}"		
-			intro="{invoice>ShipperName}"
-			title="{invoice>ProductName}">
-			<attributes>
-                <ObjectAttribute
-                    title="{i18n>quantityTitle}"
-                    text="{invoice>Quantity}"/>
-                <ObjectAttribute
-                    title="{i18n>dateTitle}"
-                    text="{
-                        path: 'invoice>ShippedDate',
-                        type: 'sap.ui.model.type.Date'
-                    }"/>
-			</attributes>
-		</ObjectHeader>
-		<wt:ProductRating 
-			id="rating"
-			tooltip="{invoice>ProductName}"
-			class="sapUiSmallMarginBeginEnd" 
-			change=".onRatingChange"/>
-	</Page>
-</mvc:View>
\ No newline at end of file
+              }
+            }"/>
+        </attributes>
+    </ObjectHeader>
+    <wt:ProductRating
+      id="rating"
+      tooltip="{invoice>ProductName}"
+      class="sapUiSmallMarginBeginEnd"
+      change=".onRatingChange"/>
+  </Page>
+</mvc:View>
diff --git a/steps/38/webapp/view/InvoiceList.view.xml b/steps/38/webapp/view/InvoiceList.view.xml
index 81fa0590..59e9292e 100644
--- a/steps/38/webapp/view/InvoiceList.view.xml
+++ b/steps/38/webapp/view/InvoiceList.view.xml
@@ -77,12 +77,15 @@
 							<Text
 								text="{invoice>ShipperName}"/>
 							<ObjectNumber
+						    core:require="{
+						      Currency: 'sap/ui/model/type/Currency'
+						    }"
 								number="{
 									parts: [
 										'invoice>ExtendedPrice',
 										'view>/currency'
 									],
-									type: 'sap.ui.model.type.Currency',
+									type: 'Currency',
 									formatOptions: {
 										showMeasure: false
 									}