diff --git a/hotel/__manifest__.py b/hotel/__manifest__.py
index 23eda4660..56728c424 100644
--- a/hotel/__manifest__.py
+++ b/hotel/__manifest__.py
@@ -17,7 +17,7 @@
         'account_payment_return',
     ],
     'license': "AGPL-3",
-    'demo': ['data/hotel_data.xml'],
+    'demo': ['data/hotel_demo.xml'],
     'data': [
         'security/hotel_security.xml',
         'security/ir.model.access.csv',
diff --git a/hotel/data/hotel_data.xml b/hotel/data/hotel_data.xml
deleted file mode 100644
index 51343aa87..000000000
--- a/hotel/data/hotel_data.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-
-    <!-- hotel_floor  -->
-
-        <record id="hotel_floor_ground0" model="hotel.floor">
-            <field name="name">First Floor</field>
-        </record>
-        <record id="hotel_floor_ground1" model="hotel.floor">
-            <field name="name">Second Floor</field>
-        </record>
-
-    <!-- hotel_room_amenities_type  -->
-
-        <record id="hotel_amenitiy_type_0" model="hotel.amenity.type">
-            <field name="name">Beds</field>
-        </record>
-        <record id="hotel_amenity_type_1" model="hotel.amenity.type">
-            <field name="name">Connectivity</field>
-        </record>
-        <record id="hotel_amenity_type_2" model="hotel.amenity.type">
-            <field name="name">Extra</field>
-        </record>
-
-    <!-- hotel_room_amenitues -->
-
-        <record id="hotel_amenity_0" model="hotel.amenity">
-            <field name="name">Twin Beds</field>
-            <field name="room_amenity_type_id" search="[('name', '=', 'Beds')]"/>
-        </record>
-        <record id="hotel_amenity_1" model="hotel.amenity">
-            <field name="name">Double Beds</field>
-            <field name="room_amenity_type_id" search="[('name', '=', 'Beds')]"/>
-        </record>
-        <record id="hotel_amenity_2" model="hotel.amenity">
-            <field name="name">Extra Bed</field>
-            <field name="room_amenity_type_id" search="[('name', '=', 'Beds')]"/>
-        </record>
-        <record id="hotel_amenity_3" model="hotel.amenity">
-            <field name="name">4G</field>
-            <field name="room_amenity_type_id" search="[('name', '=', 'Connectivity')]"/>
-        </record>
-
-
-    <!-- hotel_room_type    -->
-
-        <record id="hotel_room_type_0" model="hotel.room.type">
-            <field name="name">Economic</field>
-            <field name="code_type">ECO</field>
-            <field name="list_price">15.00</field>
-        </record>
-        <record id="hotel_room_type_1" model="hotel.room.type">
-            <field name="name">Single</field>
-            <field name="code_type">SNG</field>
-            <field name="list_price">20.00</field>
-        </record>
-        <record id="hotel_room_type_2" model="hotel.room.type">
-            <field name="name">Double</field>
-            <field name="code_type">DBL</field>
-            <field name="list_price">25.00</field>
-        </record>
-        <record id="hotel_room_type_3" model="hotel.room.type">
-            <field name="name">Triple</field>
-            <field name="code_type">TRP</field>
-            <field name="list_price">35.00</field>
-        </record>
-
-    <!-- hotel_room -->
-
-        <record id="hotel_room_0" model="hotel.room">
-            <field name="name">Economic-101</field>
-            <field name="room_type_id" search="[('name', '=', 'Economic')]"/>
-            <field name="floor_id" search="[('name', '=', 'First Floor')]"/>
-            <field name="list_price">15.00</field>
-            <field name="capacity">1</field>
-        </record>
-        <record id="hotel_room_1" model="hotel.room">
-            <field name="name">Single-101</field>
-            <field name="room_type_id" search="[('name', '=', 'Single')]"/>
-            <field name="floor_id" search="[('name', '=', 'First Floor')]"/>
-            <field name="list_price">20.00</field>
-            <field name="capacity">2</field>
-        </record>
-        <record id="hotel_room_2" model="hotel.room">
-            <field name="name">Single-102</field>
-            <field name="room_type_id" search="[('name', '=', 'Single')]"/>
-            <field name="floor_id" search="[('name', '=', 'First Floor')]"/>
-            <field name="list_price">20.00</field>
-            <field name="capacity">2</field>
-        </record>
-        <record id="hotel_room_3" model="hotel.room">
-            <field name="name">Single-103</field>
-            <field name="room_type_id" search="[('name', '=', 'Single')]"/>
-            <field name="floor_id" search="[('name', '=', 'First Floor')]"/>
-            <field name="list_price">20.00</field>
-            <field name="capacity">2</field>
-        </record>
-        <record id="hotel_room_4" model="hotel.room">
-            <field name="name">Double-201</field>
-            <field name="room_type_id" search="[('name', '=', 'Double')]"/>
-            <field name="floor_id" search="[('name', '=', 'Second Floor')]"/>
-            <field name="list_price">25.00</field>
-            <field name="capacity">2</field>
-        </record>
-        <record id="hotel_room_5" model="hotel.room">
-            <field name="name">Double-202</field>
-            <field name="room_type_id" search="[('name', '=', 'Double')]"/>
-            <field name="floor_id" search="[('name', '=', 'Second Floor')]"/>
-            <field name="list_price">25.00</field>
-            <field name="capacity">2</field>
-        </record>
-        <record id="hotel_room_6" model="hotel.room">
-            <field name="name">Triple-203</field>
-            <field name="room_type_id" search="[('name', '=', 'Triple')]"/>
-            <field name="floor_id" search="[('name', '=', 'Second Floor')]"/>
-            <field name="list_price">25.00</field>
-            <field name="capacity">3</field>
-        </record>
-
-    </data>
-</odoo>
diff --git a/hotel/data/hotel_demo.xml b/hotel/data/hotel_demo.xml
new file mode 100644
index 000000000..f2a03e493
--- /dev/null
+++ b/hotel/data/hotel_demo.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="0">
+
+    <!-- hotel.floor -->
+
+        <record id="hotel_floor_0" model="hotel.floor">
+            <field name="name">Ground Floor</field>
+        </record>
+        <record id="hotel_floor_1" model="hotel.floor">
+            <field name="name">First Floor</field>
+        </record>
+        <record id="hotel_floor_2" model="hotel.floor">
+            <field name="name">Second Floor</field>
+        </record>
+
+    <!-- hotel.amenity.type -->
+
+        <record id="hotel_amenity_type_0" model="hotel.amenity.type">
+            <field name="name">Toiletries</field>
+        </record>
+        <record id="hotel_amenity_type_1" model="hotel.amenity.type">
+            <field name="name">Connectivity</field>
+        </record>
+        <record id="hotel_amenity_type_2" model="hotel.amenity.type">
+            <field name="name">Kitchen facilities</field>
+        </record>
+
+    <!-- hotel.amenity -->
+
+        <record id="hotel_amenity_0" model="hotel.amenity">
+            <field name="name">Shampoo and Soap</field>
+            <field name="room_amenity_type_id" ref="hotel_amenity_type_0"/>
+        </record>
+        <record id="hotel_amenity_1" model="hotel.amenity">
+            <field name="name">High-quality Shampoo and Soap Essential Herbs</field>
+            <field name="room_amenity_type_id" ref="hotel_amenity_type_0"/>
+        </record>
+        <record id="hotel_amenity_2" model="hotel.amenity">
+            <field name="name">Hair Dryer</field>
+            <field name="room_amenity_type_id" ref="hotel_amenity_type_0"/>
+        </record>
+        <record id="hotel_amenity_3" model="hotel.amenity">
+            <field name="name">High speed Wired Internet access</field>
+            <field name="room_amenity_type_id" ref="hotel_amenity_type_1"/>
+        </record>
+        <record id="hotel_amenity_4" model="hotel.amenity">
+            <field name="name">Wi-Fi</field>
+            <field name="room_amenity_type_id" ref="hotel_amenity_type_1"/>
+        </record>
+        <record id="hotel_amenity_5" model="hotel.amenity">
+            <field name="name">Microwave oven</field>
+            <field name="room_amenity_type_id" ref="hotel_amenity_type_2"/>
+        </record>
+        <record id="hotel_amenity_6" model="hotel.amenity">
+            <field name="name">Half-sized Refrigerator</field>
+            <field name="room_amenity_type_id" ref="hotel_amenity_type_2"/>
+        </record>
+
+    <!-- hotel.board.service -->
+
+    <!-- hotel.room.type.class -->
+
+        <record id="hotel_room_type_class_0" model="hotel.room.type.class">
+            <field name="name">Room</field>
+        </record>
+        <record id="hotel_room_type_class_1" model="hotel.room.type.class">
+            <field name="name">Conference</field>
+        </record>
+
+    <!-- hotel.room.type    -->
+
+        <record id="hotel_room_type_0" model="hotel.room.type">
+            <field name="name">Economic</field>
+            <field name="code_type">ECO</field>
+            <field name="list_price">21.00</field>
+            <field name="class_id" ref="hotel_room_type_class_0"/>
+            <field name="room_amenity_ids"
+                   eval="[(4, ref('hotel_amenity_0'))]"/>
+
+        </record>
+        <record id="hotel_room_type_1" model="hotel.room.type">
+            <field name="name">Single</field>
+            <field name="code_type">SNG</field>
+            <field name="list_price">20.00</field>
+            <field name="class_id" ref="hotel_room_type_class_0"/>
+            <field name="room_amenity_ids"
+                   eval="[(4, ref('hotel_amenity_0')), (4, ref('hotel_amenity_4'))]"/>
+        </record>
+        <record id="hotel_room_type_2" model="hotel.room.type">
+            <field name="name">Double</field>
+            <field name="code_type">DBL</field>
+            <field name="list_price">25.00</field>
+            <field name="class_id" ref="hotel_room_type_class_0"/>
+            <field name="room_amenity_ids"
+                   eval="[(4, ref('hotel_amenity_0')), (4, ref('hotel_amenity_4'))]"/>
+        </record>
+        <record id="hotel_room_type_3" model="hotel.room.type">
+            <field name="name">Triple</field>
+            <field name="code_type">TRP</field>
+            <field name="list_price">35.00</field>
+            <field name="class_id" ref="hotel_room_type_class_0"/>
+            <field name="room_amenity_ids"
+                   eval="[(4, ref('hotel_amenity_0')), (4, ref('hotel_amenity_4'))]"/>
+        </record>
+
+        <record id="hotel_room_type_4" model="hotel.room.type">
+            <field name="name">Conference Room</field>
+            <field name="code_type">CFR</field>
+            <field name="list_price">80.00</field>
+            <field name="class_id" ref="hotel_room_type_class_1"/>
+            <field name="room_amenity_ids"
+                   eval="[(4, ref('hotel_amenity_3')), (4, ref('hotel_amenity_4'))]"/>
+        </record>
+
+    <!-- hotel.room -->
+
+        <record id="hotel_room_0" model="hotel.room">
+            <field name="name">Economic-101</field>
+            <field name="room_type_id" ref="hotel_room_type_0"/>
+            <field name="floor_id" ref="hotel_floor_1"/>
+            <field name="capacity">2</field>
+        </record>
+        <record id="hotel_room_1" model="hotel.room">
+            <field name="name">Single-101</field>
+            <field name="room_type_id" ref="hotel_room_type_1"/>
+            <field name="floor_id" ref="hotel_floor_1"/>
+            <field name="capacity">1</field>
+        </record>
+        <record id="hotel_room_2" model="hotel.room">
+            <field name="name">Single-102</field>
+            <field name="room_type_id" ref="hotel_room_type_1"/>
+            <field name="floor_id" ref="hotel_floor_1"/>
+            <field name="capacity">1</field>
+        </record>
+        <record id="hotel_room_3" model="hotel.room">
+            <field name="name">Single-103</field>
+            <field name="room_type_id" ref="hotel_room_type_1"/>
+            <field name="floor_id" ref="hotel_floor_1"/>
+            <field name="capacity">1</field>
+        </record>
+        <record id="hotel_room_4" model="hotel.room">
+            <field name="name">Double-201</field>
+            <field name="room_type_id" ref="hotel_room_type_2"/>
+            <field name="floor_id" ref="hotel_floor_2"/>
+            <field name="capacity">2</field>
+        </record>
+        <record id="hotel_room_5" model="hotel.room">
+            <field name="name">Double-202</field>
+            <field name="room_type_id" ref="hotel_room_type_2"/>
+            <field name="floor_id" ref="hotel_floor_2"/>
+            <field name="capacity">2</field>
+        </record>
+        <record id="hotel_room_6" model="hotel.room">
+            <field name="name">Triple-203</field>
+            <field name="room_type_id" ref="hotel_room_type_3"/>
+            <field name="floor_id" ref="hotel_floor_2"/>
+            <field name="capacity">3</field>
+        </record>
+        <record id="hotel_room_7" model="hotel.room">
+            <field name="name">Open Talk Away Room</field>
+            <field name="room_type_id" ref="hotel_room_type_4"/>
+            <field name="floor_id" ref="hotel_floor_0"/>
+            <field name="capacity">1</field>
+        </record>
+
+    <!-- product.product for hotel services -->
+
+        <record id="hotel_service_0" model="product.product">
+            <field name="name">Breakfast Buffet</field>
+            <field name="list_price">5.0</field>
+            <field name="type">service</field>
+            <field name="purchase_ok">False</field>
+            <field name="is_hotel_service">True</field>
+            <field name="per_day">True</field>
+            <field name="per_person">True</field>
+        </record>
+
+        <record id="hotel_service_1" model="product.product">
+            <field name="name">Extra Bed</field>
+            <field name="list_price">15.0</field>
+            <field name="type">service</field>
+            <field name="purchase_ok">False</field>
+            <field name="is_hotel_service">True</field>
+            <field name="per_day">False</field>
+            <field name="per_person">True</field>
+            <field name="daily_limit">1</field>
+        </record>
+
+        <record id="hotel_service_3" model="product.product">
+            <field name="name">Late Check-out</field>
+            <field name="list_price">10.0</field>
+            <field name="type">service</field>
+            <field name="purchase_ok">False</field>
+            <field name="is_hotel_service">True</field>
+            <field name="per_day">False</field>
+            <field name="per_person">False</field>
+        </record>
+
+    <!-- hotel.folio -->
+
+        <!-- reservation of 1 economic room for 1 person -->
+        <record id="hotel_folio_0" model="hotel.folio">
+            <field name="partner_id" ref="base.res_partner_address_27"/>
+            <field name="room_lines"
+                   eval="[(5, 0), (0, 0, {
+                    'room_type_id': ref('hotel_room_type_0'),
+                    'checkin': DateTime.today().strftime('%Y-%m-%d'),
+                    'checkout': (DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d'),
+                    'adults': 2,
+                    'state': 'confirm',
+                    })]"/>
+        </record>
+        <!-- reservation of 1 triple room for 3 people on behalf on the company -->
+        <record id="hotel_folio_1" model="hotel.folio">
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="room_lines"
+                   eval="[(5, 0), (0, 0, {
+                    'room_type_id': ref('hotel_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d'),
+                    'checkout': (DateTime.today() + timedelta(days=4)).strftime('%Y-%m-%d'),
+                    'adults': 3,
+                    })]"/>
+        </record>
+        <!-- reservation of 3 single rooms for 3 people with 1 cancelled -->
+        <record id="hotel_folio_2" model="hotel.folio">
+            <field name="partner_id" ref="base.res_partner_address_10"/>
+            <field name="room_lines"
+                   eval="[(5, 0),
+                    (0, 0, {'room_type_id': ref('hotel_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d'),
+                    'checkout': (DateTime.today() + timedelta(days=4)).strftime('%Y-%m-%d'),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {'room_type_id': ref('hotel_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d'),
+                    'checkout': (DateTime.today() + timedelta(days=4)).strftime('%Y-%m-%d'),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'room_type_id': ref('hotel_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d'),
+                    'checkout': (DateTime.today() + timedelta(days=4)).strftime('%Y-%m-%d'),
+                    'adults': 1,
+                    'state': 'cancelled',
+                    })]"/>
+        </record>
+        <!-- reservation of the conference room for 1 day on behalf of a company -->
+        <record id="hotel_folio_3" model="hotel.folio">
+            <field name="partner_id" ref="base.res_partner_12"/>
+            <field name="room_lines"
+                   eval="[(5, 0), (0, 0, {'room_type_id': ref('hotel_room_type_4'),
+                    'checkin': (DateTime.today() + timedelta(days=3)).strftime('%Y-%m-%d'),
+                    'checkout': (DateTime.today() + timedelta(days=4)).strftime('%Y-%m-%d'),
+                    'adults': 1,
+                    'state': 'confirm',
+                    })]"/>
+        </record>
+
+        <!-- out of service room -->
+
+    </data>
+</odoo>