diff --git a/README.md b/README.md
index 2a8f054..5bcd49a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,11 @@ Adds monitor, docking station, keyboard, mouse, headset
 
 ## Dependencies
 
-* iTop End-User Devices (itop-endusers-devices/2.7.5) needs to be enabled during setup
+* iTop End-User Devices (itop-endusers-devices) needs to be enabled during setup
+
+## iTop Compatibility
+
+The extension was tested on iTop 2.7.11 and 3.1.1
 
 ## Attribution
 
diff --git a/br-costcenter-bridge-for-br-peripherals/datamodel.br-costcenter-bridge-for-br-peripherals.xml b/br-costcenter-bridge-for-br-peripherals/datamodel.br-costcenter-bridge-for-br-peripherals.xml
index f5f4bb2..b27a34c 100644
--- a/br-costcenter-bridge-for-br-peripherals/datamodel.br-costcenter-bridge-for-br-peripherals.xml
+++ b/br-costcenter-bridge-for-br-peripherals/datamodel.br-costcenter-bridge-for-br-peripherals.xml
@@ -187,5 +187,61 @@
                 </search>
             </presentation>
         </class>
+        <class id="MobilePhone" _delta="if_exists">
+            <presentation>
+                <details>
+                    <items>
+                        <item id="costcenter_id" _delta="delete" />
+                        <item id="col:col2" _delta="must_exist">
+                            <items>
+                                <item id="fieldset:Server:otherinfo" _delta="must_exist">
+                                    <items>
+                                        <item id="costcenter_id" _delta="define">
+                                            <rank>5</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                    </items>
+                </details>
+                <search>
+                    <items>
+                        <item id="costcenter_id" _delta="delete" />
+                        <item id="costcenter_id" _delta="define">
+                            <rank>160</rank>
+                        </item>
+                    </items>
+                </search>
+            </presentation>
+        </class>
+        <class id="IPPhone" _delta="if_exists">
+            <presentation>
+                <details>
+                    <items>
+                        <item id="costcenter_id" _delta="delete" />
+                        <item id="col:col2" _delta="must_exist">
+                            <items>
+                                <item id="fieldset:Server:otherinfo" _delta="must_exist">
+                                    <items>
+                                        <item id="costcenter_id" _delta="define">
+                                            <rank>5</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                    </items>
+                </details>
+                <search>
+                    <items>
+                        <item id="costcenter_id" _delta="delete" />
+                        <item id="costcenter_id" _delta="define">
+                            <rank>140</rank>
+                        </item>
+                    </items>
+                </search>
+            </presentation>
+        </class>
     </classes>
 </itop_design>
diff --git a/br-costcenter-bridge-for-br-peripherals/model.br-costcenter-bridge-for-br-peripherals.php b/br-costcenter-bridge-for-br-peripherals/model.br-costcenter-bridge-for-br-peripherals.php
deleted file mode 100644
index bf8bd1d..0000000
--- a/br-costcenter-bridge-for-br-peripherals/model.br-costcenter-bridge-for-br-peripherals.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2024 Björn Rudner
- * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-09
- *
- * PHP Data Model definition file
- */
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you use supply a datamodel.xxxx.xml file with your module
-// the this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
diff --git a/br-costcenter-bridge-for-br-peripherals/module.br-costcenter-bridge-for-br-peripherals.php b/br-costcenter-bridge-for-br-peripherals/module.br-costcenter-bridge-for-br-peripherals.php
index 823ce05..b3474bc 100644
--- a/br-costcenter-bridge-for-br-peripherals/module.br-costcenter-bridge-for-br-peripherals.php
+++ b/br-costcenter-bridge-for-br-peripherals/module.br-costcenter-bridge-for-br-peripherals.php
@@ -3,14 +3,14 @@
 /**
  * @copyright   Copyright (C) 2024 Björn Rudner
  * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-16
+ * @version     2024-08-27
  *
  * iTop module definition file
  */
 
 SetupWebPage::AddModule(
     __FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-    'br-costcenter-bridge-for-br-peripherals/0.6.0',
+    'br-costcenter-bridge-for-br-peripherals/0.7.0',
     array(
         // Identification
         'label' => 'Bridge - Costcenter + Periperals',
@@ -18,17 +18,15 @@
 
         // Setup
         'dependencies' => array(
-            'br-costcenter/0.1.0',
-            'br-peripherals/0.6.0',
+            'br-costcenter/0.4.0',
+            'br-peripherals/0.7.0',
         ),
         'mandatory' => false,
         'visible' => true, // To prevent auto-install but shall not be listed in the install wizard
         'auto_select' => 'SetupInfo::ModuleIsSelected("br-costcenter") && SetupInfo::ModuleIsSelected("br-peripherals")',
 
         // Components
-        'datamodel' => array(
-            'model.br-costcenter-bridge-for-br-peripherals.php'
-        ),
+        'datamodel' => array(),
         'webservice' => array(),
         'dictionary' => array(),
         'data.struct' => array(),
diff --git a/br-peripherals-bridge-for-teemip-ip-mgmt/datamodel.br-peripherals-bridge-for-teemip-ip-mgmt.xml b/br-peripherals-bridge-for-teemip-ip-mgmt/datamodel.br-peripherals-bridge-for-teemip-ip-mgmt.xml
index e3622c5..bddcc44 100644
--- a/br-peripherals-bridge-for-teemip-ip-mgmt/datamodel.br-peripherals-bridge-for-teemip-ip-mgmt.xml
+++ b/br-peripherals-bridge-for-teemip-ip-mgmt/datamodel.br-peripherals-bridge-for-teemip-ip-mgmt.xml
@@ -91,5 +91,53 @@
                 </search>
             </presentation>
         </class>
+        <class id="MobilePhone" _delta="if_exists">
+            <presentation>
+                <details>
+                    <items>
+                        <item id="macaddress" _delta="delete" />
+                        <item id="ipaddress_id" _delta="delete" />
+                        <item id="col:col1">
+                            <items>
+                                <item id="fieldset:Server:moreinfo">
+                                    <items>
+                                        <item id="macaddress" _delta="define">
+                                            <rank>61</rank>
+                                        </item>
+                                        <item id="ipaddress_id" _delta="define">
+                                            <rank>62</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                    </items>
+                </details>
+            </presentation>
+        </class>
+        <class id="IPPhone" _delta="if_exists">
+            <presentation>
+                <details>
+                    <items>
+                        <item id="macaddress" _delta="delete" />
+                        <item id="ipaddress_id" _delta="delete" />
+                        <item id="col:col1">
+                            <items>
+                                <item id="fieldset:Server:moreinfo">
+                                    <items>
+                                        <item id="macaddress" _delta="define">
+                                            <rank>61</rank>
+                                        </item>
+                                        <item id="ipaddress_id" _delta="define">
+                                            <rank>62</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                    </items>
+                </details>
+            </presentation>
+        </class>
     </classes>
 </itop_design>
diff --git a/br-peripherals-bridge-for-teemip-ip-mgmt/de.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php b/br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/de.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
similarity index 95%
rename from br-peripherals-bridge-for-teemip-ip-mgmt/de.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
rename to br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/de.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
index 6645430..33eb6dc 100644
--- a/br-peripherals-bridge-for-teemip-ip-mgmt/de.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
+++ b/br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/de.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
@@ -3,7 +3,7 @@
 /**
  * @copyright   Copyright (C) 2024 Björn Rudner
  * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-16
+ * @version     2024-08-27
  *
  * Localized data
  */
diff --git a/br-peripherals-bridge-for-teemip-ip-mgmt/en.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php b/br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/en.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
similarity index 95%
rename from br-peripherals-bridge-for-teemip-ip-mgmt/en.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
rename to br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/en.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
index 1b9cde9..1bd3809 100644
--- a/br-peripherals-bridge-for-teemip-ip-mgmt/en.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
+++ b/br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/en.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php
@@ -3,7 +3,7 @@
 /**
  * @copyright   Copyright (C) 2024 Björn Rudner
  * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-16
+ * @version     2024-08-27
  *
  * Localized data
  */
diff --git a/br-peripherals-bridge-for-teemip-ip-mgmt/model.br-peripherals-bridge-for-teemip-ip-mgmt.php b/br-peripherals-bridge-for-teemip-ip-mgmt/model.br-peripherals-bridge-for-teemip-ip-mgmt.php
deleted file mode 100644
index fb58382..0000000
--- a/br-peripherals-bridge-for-teemip-ip-mgmt/model.br-peripherals-bridge-for-teemip-ip-mgmt.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2024 Björn Rudner
- * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-16
- *
- * PHP Data Model definition file
- */
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you use supply a datamodel.xxxx.xml file with your module
-// the this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
diff --git a/br-peripherals-bridge-for-teemip-ip-mgmt/module.br-peripherals-bridge-for-teemip-ip-mgmt.php b/br-peripherals-bridge-for-teemip-ip-mgmt/module.br-peripherals-bridge-for-teemip-ip-mgmt.php
index 6af4145..620a6e6 100644
--- a/br-peripherals-bridge-for-teemip-ip-mgmt/module.br-peripherals-bridge-for-teemip-ip-mgmt.php
+++ b/br-peripherals-bridge-for-teemip-ip-mgmt/module.br-peripherals-bridge-for-teemip-ip-mgmt.php
@@ -3,14 +3,14 @@
 /**
  * @copyright   Copyright (C) 2024 Björn Rudner
  * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-16
+ * @version     2024-08-27
  *
  * iTop module definition file
  */
 
 SetupWebPage::AddModule(
     __FILE__,
-    'br-peripherals-bridge-for-teemip-ip-mgmt/0.6.0',
+    'br-peripherals-bridge-for-teemip-ip-mgmt/0.7.0',
     array(
         // Identification
         //
@@ -23,7 +23,7 @@
             'itop-endusers-devices/2.7.0',
             'teemip-ip-mgmt/3.0.1',
             'teemip-config-mgmt-adaptor/3.0.1',
-            'br-peripherals/0.6.0',
+            'br-peripherals/0.7.0',
         ),
         'mandatory' => false,
         'visible' => true, // To prevent auto-install but shall not be listed in the install wizard
@@ -31,9 +31,7 @@
 
         // Components
         //
-        'datamodel' => array(
-            'model.br-peripherals-bridge-for-teemip-ip-mgmt.php'
-        ),
+        'datamodel' => array(),
         'data.struct' => array(),
         'data.sample' => array(),
 
diff --git a/br-peripherals/datamodel.br-peripherals.xml b/br-peripherals/datamodel.br-peripherals.xml
index 9637637..e2889c3 100644
--- a/br-peripherals/datamodel.br-peripherals.xml
+++ b/br-peripherals/datamodel.br-peripherals.xml
@@ -19,7 +19,12 @@
                         <attribute id="name" />
                     </attributes>
                 </naming>
-                <display_template />
+                <fields_semantic>
+                    <state_attribute>status</state_attribute>
+                </fields_semantic>
+                <style>
+                    <icon>images/usb-hub_256.png</icon>
+                </style>
                 <icon>images/usb-hub.png</icon>
                 <reconciliation>
                     <attributes>
@@ -216,7 +221,12 @@
                         <attribute id="name" />
                     </attributes>
                 </naming>
-                <display_template />
+                <fields_semantic>
+                    <state_attribute>status</state_attribute>
+                </fields_semantic>
+                <style>
+                    <icon>images/monitor_256.png</icon>
+                </style>
                 <icon>images/monitor.png</icon>
                 <reconciliation>
                     <attributes>
@@ -226,8 +236,6 @@
                     </attributes>
                 </reconciliation>
             </properties>
-            <fields>
-            </fields>
             <methods />
             <presentation>
                 <details>
@@ -409,7 +417,12 @@
                         <attribute id="name" />
                     </attributes>
                 </naming>
-                <display_template />
+                <fields_semantic>
+                    <state_attribute>status</state_attribute>
+                </fields_semantic>
+                <style>
+                    <icon>images/keyboard_256.png</icon>
+                </style>
                 <icon>images/keyboard.png</icon>
                 <reconciliation>
                     <attributes>
@@ -419,8 +432,6 @@
                     </attributes>
                 </reconciliation>
             </properties>
-            <fields>
-            </fields>
             <methods />
             <presentation>
                 <details>
@@ -602,7 +613,12 @@
                         <attribute id="name" />
                     </attributes>
                 </naming>
-                <display_template />
+                <fields_semantic>
+                    <state_attribute>status</state_attribute>
+                </fields_semantic>
+                <style>
+                    <icon>images/mouse_256.png</icon>
+                </style>
                 <icon>images/mouse.png</icon>
                 <reconciliation>
                     <attributes>
@@ -612,8 +628,6 @@
                     </attributes>
                 </reconciliation>
             </properties>
-            <fields>
-            </fields>
             <methods />
             <presentation>
                 <details>
@@ -795,7 +809,12 @@
                         <attribute id="name" />
                     </attributes>
                 </naming>
-                <display_template />
+                <fields_semantic>
+                    <state_attribute>status</state_attribute>
+                </fields_semantic>
+                <style>
+                    <icon>images/headset_256.png</icon>
+                </style>
                 <icon>images/headset.png</icon>
                 <reconciliation>
                     <attributes>
@@ -805,8 +824,6 @@
                     </attributes>
                 </reconciliation>
             </properties>
-            <fields>
-            </fields>
             <methods />
             <presentation>
                 <details>
@@ -988,7 +1005,12 @@
                         <attribute id="name" />
                     </attributes>
                 </naming>
-                <display_template />
+                <fields_semantic>
+                    <state_attribute>status</state_attribute>
+                </fields_semantic>
+                <style>
+                    <icon>images/scanner_256.png</icon>
+                </style>
                 <icon>images/scanner.png</icon>
                 <reconciliation>
                     <attributes>
@@ -998,8 +1020,6 @@
                     </attributes>
                 </reconciliation>
             </properties>
-            <fields>
-            </fields>
             <methods />
             <presentation>
                 <details>
@@ -1181,7 +1201,12 @@
                         <attribute id="name" />
                     </attributes>
                 </naming>
-                <display_template />
+                <fields_semantic>
+                    <state_attribute>status</state_attribute>
+                </fields_semantic>
+                <style>
+                    <icon>images/barcode-scanner_256.png</icon>
+                </style>
                 <icon>images/barcode-scanner.png</icon>
                 <reconciliation>
                     <attributes>
@@ -1191,8 +1216,6 @@
                     </attributes>
                 </reconciliation>
             </properties>
-            <fields>
-            </fields>
             <methods />
             <presentation>
                 <details>
@@ -1360,6 +1383,202 @@
                 </list>
             </presentation>
         </class>
+        <class id="MobilePhone" _delta="must_exist">
+            <presentation>
+                <details>
+                    <items>
+                        <item id="name" _delta="delete" />
+                        <item id="org_id" _delta="delete" />
+                        <item id="status" _delta="delete" />
+                        <item id="business_criticity" _delta="delete" />
+                        <item id="location_id" _delta="delete" />
+                        <item id="brand_id" _delta="delete" />
+                        <item id="model_id" _delta="delete" />
+                        <item id="phonenumber" _delta="delete" />
+                        <item id="imei" _delta="delete" />
+                        <item id="hw_pin" _delta="delete" />
+                        <item id="serialnumber" _delta="delete" />
+                        <item id="asset_number" _delta="delete" />
+                        <item id="move2production" _delta="delete" />
+                        <item id="purchase_date" _delta="delete" />
+                        <item id="end_of_warranty" _delta="delete" />
+                        <item id="description" _delta="delete" />
+                        <item id="col:col1">
+                            <rank>10</rank>
+                            <items>
+                                <item id="fieldset:Server:baseinfo">
+                                    <rank>10</rank>
+                                    <items>
+                                        <item id="name">
+                                            <rank>10</rank>
+                                        </item>
+                                        <item id="org_id">
+                                            <rank>20</rank>
+                                        </item>
+                                        <item id="status">
+                                            <rank>30</rank>
+                                        </item>
+                                        <item id="business_criticity">
+                                            <rank>40</rank>
+                                        </item>
+                                        <item id="location_id">
+                                            <rank>50</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                                <item id="fieldset:Server:moreinfo">
+                                    <rank>20</rank>
+                                    <items>
+                                        <item id="brand_id">
+                                            <rank>10</rank>
+                                        </item>
+                                        <item id="model_id">
+                                            <rank>20</rank>
+                                        </item>
+                                        <item id="phonenumber">
+                                            <rank>30</rank>
+                                        </item>
+                                        <item id="imei">
+                                            <rank>40</rank>
+                                        </item>
+                                        <item id="hw_pin">
+                                            <rank>50</rank>
+                                        </item>
+                                        <item id="serialnumber">
+                                            <rank>80</rank>
+                                        </item>
+                                        <item id="asset_number">
+                                            <rank>90</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                        <item id="col:col2">
+                            <rank>20</rank>
+                            <items>
+                                <item id="fieldset:Server:Date">
+                                    <rank>10</rank>
+                                    <items>
+                                        <item id="move2production">
+                                            <rank>10</rank>
+                                        </item>
+                                        <item id="purchase_date">
+                                            <rank>20</rank>
+                                        </item>
+                                        <item id="end_of_warranty">
+                                            <rank>30</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                                <item id="fieldset:Server:otherinfo">
+                                    <rank>20</rank>
+                                    <items>
+                                        <item id="description">
+                                            <rank>10</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                    </items>
+                </details>
+            </presentation>
+        </class>
+        <class id="IPPhone" _delta="must_exist">
+            <presentation>
+                <details>
+                    <items>
+                        <item id="name" _delta="delete" />
+                        <item id="org_id" _delta="delete" />
+                        <item id="status" _delta="delete" />
+                        <item id="business_criticity" _delta="delete" />
+                        <item id="location_id" _delta="delete" />
+                        <item id="brand_id" _delta="delete" />
+                        <item id="model_id" _delta="delete" />
+                        <item id="phonenumber" _delta="delete" />
+                        <item id="serialnumber" _delta="delete" />
+                        <item id="asset_number" _delta="delete" />
+                        <item id="move2production" _delta="delete" />
+                        <item id="purchase_date" _delta="delete" />
+                        <item id="end_of_warranty" _delta="delete" />
+                        <item id="description" _delta="delete" />
+                        <item id="col:col1">
+                            <rank>10</rank>
+                            <items>
+                                <item id="fieldset:Server:baseinfo">
+                                    <rank>10</rank>
+                                    <items>
+                                        <item id="name">
+                                            <rank>10</rank>
+                                        </item>
+                                        <item id="org_id">
+                                            <rank>20</rank>
+                                        </item>
+                                        <item id="status">
+                                            <rank>30</rank>
+                                        </item>
+                                        <item id="business_criticity">
+                                            <rank>40</rank>
+                                        </item>
+                                        <item id="location_id">
+                                            <rank>50</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                                <item id="fieldset:Server:moreinfo">
+                                    <rank>20</rank>
+                                    <items>
+                                        <item id="brand_id">
+                                            <rank>10</rank>
+                                        </item>
+                                        <item id="model_id">
+                                            <rank>20</rank>
+                                        </item>
+                                        <item id="phonenumber">
+                                            <rank>30</rank>
+                                        </item>
+                                        <item id="serialnumber">
+                                            <rank>80</rank>
+                                        </item>
+                                        <item id="asset_number">
+                                            <rank>90</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                        <item id="col:col2">
+                            <rank>20</rank>
+                            <items>
+                                <item id="fieldset:Server:Date">
+                                    <rank>10</rank>
+                                    <items>
+                                        <item id="move2production">
+                                            <rank>10</rank>
+                                        </item>
+                                        <item id="purchase_date">
+                                            <rank>20</rank>
+                                        </item>
+                                        <item id="end_of_warranty">
+                                            <rank>30</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                                <item id="fieldset:Server:otherinfo">
+                                    <rank>20</rank>
+                                    <items>
+                                        <item id="description">
+                                            <rank>10</rank>
+                                        </item>
+                                    </items>
+                                </item>
+                            </items>
+                        </item>
+                    </items>
+                </details>
+            </presentation>
+        </class>
         <class id="Model">
             <fields>
                 <field id="type" xsi:type="AttributeEnum">
diff --git a/br-peripherals/de.dict.br-peripherals.php b/br-peripherals/dictionaries/de.dict.br-peripherals.php
similarity index 98%
rename from br-peripherals/de.dict.br-peripherals.php
rename to br-peripherals/dictionaries/de.dict.br-peripherals.php
index ee0ad0e..ef2e683 100644
--- a/br-peripherals/de.dict.br-peripherals.php
+++ b/br-peripherals/dictionaries/de.dict.br-peripherals.php
@@ -3,7 +3,7 @@
 /**
  * @copyright   Copyright (C) 2024 Björn Rudner
  * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-16
+ * @version     2024-08-27
  *
  * Localized data
  */
diff --git a/br-peripherals/en.dict.br-peripherals.php b/br-peripherals/dictionaries/en.dict.br-peripherals.php
similarity index 98%
rename from br-peripherals/en.dict.br-peripherals.php
rename to br-peripherals/dictionaries/en.dict.br-peripherals.php
index 6237585..4d76459 100644
--- a/br-peripherals/en.dict.br-peripherals.php
+++ b/br-peripherals/dictionaries/en.dict.br-peripherals.php
@@ -3,7 +3,7 @@
 /**
  * @copyright   Copyright (C) 2024 Björn Rudner
  * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-09
+ * @version     2024-08-27
  *
  * Localized data
  */
diff --git a/br-peripherals/model.br-peripherals.php b/br-peripherals/model.br-peripherals.php
deleted file mode 100644
index bf8bd1d..0000000
--- a/br-peripherals/model.br-peripherals.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2024 Björn Rudner
- * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-09
- *
- * PHP Data Model definition file
- */
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you use supply a datamodel.xxxx.xml file with your module
-// the this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
diff --git a/br-peripherals/module.br-peripherals.php b/br-peripherals/module.br-peripherals.php
index b49cc03..d8e90b3 100644
--- a/br-peripherals/module.br-peripherals.php
+++ b/br-peripherals/module.br-peripherals.php
@@ -3,14 +3,14 @@
 /**
  * @copyright   Copyright (C) 2024 Björn Rudner
  * @license     https://www.gnu.org/licenses/gpl-3.0.en.html
- * @version     2024-08-16
+ * @version     2024-08-27
  *
  * iTop module definition file
  */
 
 SetupWebPage::AddModule(
     __FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-    'br-peripherals/0.6.0',
+    'br-peripherals/0.7.0',
     array(
         // Identification
         //
@@ -21,16 +21,14 @@
         //
         'dependencies' => array(
             '(itop-config-mgmt/2.5.0 & itop-config-mgmt/<3.0.0)||itop-structure/3.0.0',
-            'itop-endusers-devices/2.7.5',
+            'itop-endusers-devices/2.7.5||itop-endusers-devices/3.0.0',
         ),
         'mandatory' => false,
         'visible' => true,
 
         // Components
         //
-        'datamodel' => array(
-            'model.br-peripherals.php'
-        ),
+        'datamodel' => array(),
         'webservice' => array(),
         'data.struct' => array(),
         'data.sample' => array(),
diff --git a/extension.xml b/extension.xml
index c62f181..624db5e 100644
--- a/extension.xml
+++ b/extension.xml
@@ -16,10 +16,10 @@
         <![CDATA[Adds monitor, docking station, keyboard, mouse, headset]]>
     </description>
     <version>
-        <![CDATA[0.6.0]]>
+        <![CDATA[0.6.1]]>
     </version>
     <release_date>
-        <![CDATA[2024-08-16]]>
+        <![CDATA[2024-08-27]]>
     </release_date>
     <version_description>
         <![CDATA[]]>