diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 4c0d9369aa..2a5efc46e9 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -2758,16 +2758,6 @@
-
-
-
-
- SELECT Hypervisor AS o WHERE o.server_id = :this->id
- SELECT Server AS o WHERE o.id = :this->server_id
-
-
-
-
FunctionalCI
diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
index 44f2377089..e3c9160fac 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
+++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
@@ -901,6 +901,18 @@
+
+
+
+
+
+ SELECT Hypervisor AS o WHERE o.server_id = :this->id
+ SELECT Server AS o WHERE o.id = :this->server_id
+
+
+
+
+