diff --git a/bt5/vifib_base/PropertySheetTemplateItem/SoftwareInstance.py b/bt5/vifib_base/PropertySheetTemplateItem/SoftwareInstance.py
deleted file mode 100644
index fc87f184c74534fc589e6acd75aafb3f521a249e..0000000000000000000000000000000000000000
--- a/bt5/vifib_base/PropertySheetTemplateItem/SoftwareInstance.py
+++ /dev/null
@@ -1,49 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-#               Lukasz Nowak <luke@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-class SoftwareInstance:
-  """
-      SoftwareInstance properties for all ERP5 objects
-  """
-
-  _properties = (
-      {   'id'          : 'connection_xml',
-          'description' : 'XML representing connection parameters',
-          'type'        : 'text',
-          'mode'        : 'w' },
-      {   'id'          : 'ssl_key',
-          'description' : 'Raw representation of related SSL key',
-          'type'        : 'text',
-          'mode'        : 'w' },
-      {   'id'          : 'ssl_certificate',
-          'description' : 'Raw representation of related SSL certificate',
-          'type'        : 'text',
-          'mode'        : 'w' },
-  )
-
-
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/SoftwareInstanceConstraint.py b/bt5/vifib_base/PropertySheetTemplateItem/SoftwareInstanceConstraint.py
deleted file mode 100644
index 6ec1f11bbe99a0f8035babde0ab5e3c45782245c..0000000000000000000000000000000000000000
--- a/bt5/vifib_base/PropertySheetTemplateItem/SoftwareInstanceConstraint.py
+++ /dev/null
@@ -1,79 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved
-#                    Lukasz Nowak <luke@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-class SoftwareInstanceConstraint:
-  """Constraints for Software Instance"""
-  _constraints = (
-    { 'id'            : 'text_content_existence',
-      'description'   : 'Property text content must be defined',
-      'type'          : 'PropertyExistence',
-      'text_content'  : None,
-      "message_property_not_set" : 'XML must be set',
-      "message_no_such_property" : 'XML must be set'
-    },
-    { 'id'            : 'reference_property_existence',
-      'description'   : 'Property reference must be defined',
-      'type'          : 'PropertyExistence',
-      'reference'     : None,
-      "message_property_not_set" : 'Reference must be set',
-      "message_no_such_property" : 'Reference must be set'
-    },
-    { 'id'            : 'property_existence',
-      'description'   : 'Property source reference must be defined',
-      'type'          : 'PropertyExistence',
-      'source_reference'     : None,
-      "message_property_not_set" : 'Source Reference must be set',
-      "message_no_such_property" : 'Source Reference must be set'
-    },
-    { 'id'            : 'destination_reference_property_existence',
-      'description'   : 'Property destination reference must be defined',
-      'type'          : 'PropertyExistence',
-      'destination_reference'     : None,
-      "message_property_not_set" : 'Destination Reference must be set',
-      "message_no_such_property" : 'Destination Reference must be set'
-    },
-    { 'id'            : 'ssl_key',
-      'description'   : 'Property SSL Key must be defined',
-      'type'          : 'PropertyExistence',
-      'ssl_key'     : None,
-      "message_property_not_set" : 'SSL Key must be set',
-      "message_no_such_property" : 'SSL Key must be set'
-    },
-    { 'id'            : 'ssl_certificate',
-      'description'   : 'Property SSL Certificate must be defined',
-      'type'          : 'PropertyExistence',
-      'ssl_certificate'     : None,
-      "message_property_not_set" : 'SSL Certificate must be set',
-      "message_no_such_property" : 'SSL Certificate must be set'
-    },
-    { 'id'            : 'text_content_validation',
-      'description'   : 'Property text content must be valid against Softwa'\
-                        're Instance XSD',
-      'type'          : 'SoftwareInstanceXmlValidationConstraint',
-    },
-  )
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/VifibSalePackingListLineConstraint.py b/bt5/vifib_base/PropertySheetTemplateItem/VifibSalePackingListLineConstraint.py
deleted file mode 100644
index 652b6928e3487c5e9e2066d85f98e2166fcc06f9..0000000000000000000000000000000000000000
--- a/bt5/vifib_base/PropertySheetTemplateItem/VifibSalePackingListLineConstraint.py
+++ /dev/null
@@ -1,73 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2002-2010 Nexedi SA and Contributors. All Rights Reserved.
-#                    Lukasz Nowak <luke@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-##############################################################################
-
-message = 'There should be exactly one ${portal_type} present in Items'
-class VifibSalePackingListLineConstraint:
-  """Constraints for Sale Packing List Line in Vifib"""
-  _constraints = (
-    { 'id'            : 'sale_packing_list_line_aggregate_computer_partition',
-      'condition'     : 'python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]',
-      'type'          : 'CategoryMembershipArity',
-      'min_arity'     : '1',
-      'max_arity'     : '1',
-      'portal_type'   : ('Computer Partition', 'Slave Partition'),
-      'base_category' : ('aggregate'),
-      'message_arity_with_portal_type_too_small': message,
-      'message_arity_with_portal_type_not_in_range': message,
-    },
-    { 'id'            : 'sale_packing_list_line_aggregate_hosting_subscription',
-      'condition'     : 'python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]',
-      'type'          : 'CategoryMembershipArity',
-      'min_arity'     : '1',
-      'max_arity'     : '1',
-      'portal_type'   : 'Hosting Subscription',
-      'base_category' : ('aggregate'),
-      'message_arity_with_portal_type_too_small': message,
-      'message_arity_with_portal_type_not_in_range': message,
-    },
-    { 'id'            : 'sale_packing_list_line_aggregate_software_instance',
-      'condition'     : 'python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]',
-      'type'          : 'CategoryMembershipArity',
-      'min_arity'     : '1',
-      'max_arity'     : '1',
-      'portal_type'   : 'Software Instance',
-      'base_category' : ('aggregate'),
-      'message_arity_with_portal_type_too_small': message,
-      'message_arity_with_portal_type_not_in_range': message,
-    },
-    { 'id'            : 'sale_packing_list_line_aggregate_software_release',
-      'condition'     : 'python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]',
-      'type'          : 'CategoryMembershipArity',
-      'min_arity'     : '1',
-      'max_arity'     : '1',
-      'portal_type'   : 'Software Release',
-      'base_category' : ('aggregate'),
-      'message_arity_with_portal_type_too_small': message,
-      'message_arity_with_portal_type_not_in_range': message,
-    },
-  )
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance.xml
new file mode 100644
index 0000000000000000000000000000000000000000..973aee9f8540bd1d90f6f7d7bca3687d9e2d7c23
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>SoftwareInstance</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/connection_xml_property.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/connection_xml_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..aac9fc4b3bbd333b301ad2047e8968c22cfee9d6
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/connection_xml_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/text</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>XML representing connection parameters</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>connection_xml_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/ssl_certificate_property.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/ssl_certificate_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..711ce34a3320265e909e972bec84aa5269af83c1
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/ssl_certificate_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/text</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Raw representation of related SSL certificate</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ssl_certificate_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/ssl_key_property.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/ssl_key_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d7aa1ef1ac0f3e76a8e57ff34f7e35a125ca1527
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/ssl_key_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/text</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Raw representation of related SSL key</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ssl_key_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b21f105ffab705a3958bca3de35dc75921bd3b49
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>SoftwareInstanceConstraint</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/destination_reference_property_existence_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/destination_reference_property_existence_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f342835a9bfbe977bcec23fafd30b59c905fc66c
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/destination_reference_property_existence_constraint.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Existence Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>destination_reference</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Property destination reference must be defined</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>destination_reference_property_existence_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>message_no_such_property</string> </key>
+            <value> <string>Destination Reference must be set</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Existence Constraint</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/property_existence_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/property_existence_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ff62e570483623e2ded15cb5cc6e7f2d74405018
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/property_existence_constraint.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Existence Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>source_reference</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Property source reference must be defined</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>property_existence_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>message_no_such_property</string> </key>
+            <value> <string>Source Reference must be set</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Existence Constraint</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/reference_property_existence_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/reference_property_existence_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63be7bea49c00350a014eabc9c9ff44d283a82b1
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/reference_property_existence_constraint.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Existence Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>reference</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Property reference must be defined</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>reference_property_existence_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>message_no_such_property</string> </key>
+            <value> <string>Reference must be set</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Existence Constraint</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/ssl_certificate_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/ssl_certificate_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab21d85aeea2e62261f7779091e5b062d1a068e9
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/ssl_certificate_constraint.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Existence Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>ssl_certificate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Property SSL Certificate must be defined</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ssl_certificate_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>message_no_such_property</string> </key>
+            <value> <string>SSL Certificate must be set</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Existence Constraint</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/ssl_key_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/ssl_key_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..788e2ad65d57579467c6c50874a7802687c83aba
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/ssl_key_constraint.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Existence Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>ssl_key</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Property SSL Key must be defined</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ssl_key_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>message_no_such_property</string> </key>
+            <value> <string>SSL Key must be set</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Existence Constraint</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/text_content_existence_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/text_content_existence_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63853f7caebfcb5ba03804b204c975204d8c0aa4
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstanceConstraint/text_content_existence_constraint.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Existence Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>text_content</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Property text content must be defined</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>text_content_existence_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>message_no_such_property</string> </key>
+            <value> <string>XML must be set</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Existence Constraint</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..10c0c5441301ddaeb236ec2766a681d82349ec19
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>VifibSalePackingListLineConstraint</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_computer_partition_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_computer_partition_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eaa912c6e928c562c03936685870175a98f95c27
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_computer_partition_constraint.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category Membership Arity Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>aggregate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_portal_type</string> </key>
+            <value> <string>python: (\'Computer Partition\', \'Slave Partition\')</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>sale_packing_list_line_aggregate_computer_partition_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>max_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_not_in_range</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_too_small</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>min_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Arity Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>test_tales_expression</string> </key>
+            <value> <string>python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]</string> </value>
+        </item>
+        <item>
+            <key> <string>use_acquisition</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_hosting_subscription_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_hosting_subscription_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0dc16ebbfd565445ac538d3ee1b94e577c1c8cd4
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_hosting_subscription_constraint.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category Membership Arity Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>aggregate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_portal_type</string> </key>
+            <value> <string>python: \'Hosting Subscription\'</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>sale_packing_list_line_aggregate_hosting_subscription_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>max_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_not_in_range</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_too_small</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>min_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Arity Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>test_tales_expression</string> </key>
+            <value> <string>python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]</string> </value>
+        </item>
+        <item>
+            <key> <string>use_acquisition</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_software_instance_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_software_instance_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c6e490ed32e57ebb03d87997fe90c988916324f0
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_software_instance_constraint.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category Membership Arity Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>aggregate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_portal_type</string> </key>
+            <value> <string>python: \'Software Instance\'</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>sale_packing_list_line_aggregate_software_instance_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>max_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_not_in_range</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_too_small</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>min_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Arity Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>test_tales_expression</string> </key>
+            <value> <string>python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]</string> </value>
+        </item>
+        <item>
+            <key> <string>use_acquisition</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_software_release_constraint.xml b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_software_release_constraint.xml
new file mode 100644
index 0000000000000000000000000000000000000000..51be64a1bd91f1ee28cd4e8351076c1cfb4b738c
--- /dev/null
+++ b/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/sale_packing_list_line_aggregate_software_release_constraint.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Category Membership Arity Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>aggregate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>constraint_portal_type</string> </key>
+            <value> <string>python: \'Software Release\'</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>sale_packing_list_line_aggregate_software_release_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>max_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_not_in_range</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>message_arity_with_portal_type_too_small</string> </key>
+            <value> <string>There should be exactly one ${portal_type} present in Items</string> </value>
+        </item>
+        <item>
+            <key> <string>min_arity</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Category Membership Arity Constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>test_tales_expression</string> </key>
+            <value> <string>python: object.getResourceValue() is not None and object.getResource() in [object.portal_preferences.getPreferredInstanceSetupResource(), object.portal_preferences.getPreferredInstanceHostingResource(), object.portal_preferences.getPreferredInstanceCleanupResource()]</string> </value>
+        </item>
+        <item>
+            <key> <string>use_acquisition</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_base/bt/revision b/bt5/vifib_base/bt/revision
index 1199cd493e5b0f7c20b1040406896a3f2004c700..396054452291e2e07fcd9f33cd76ea228a88aa3a 100644
--- a/bt5/vifib_base/bt/revision
+++ b/bt5/vifib_base/bt/revision
@@ -1 +1 @@
-219
\ No newline at end of file
+220
\ No newline at end of file
diff --git a/bt5/vifib_core/PropertySheetTemplateItem/FreeFiberRequest.py b/bt5/vifib_core/PropertySheetTemplateItem/FreeFiberRequest.py
deleted file mode 100644
index e9ea8b996b8889c0a354a1a474b102aea0be22d8..0000000000000000000000000000000000000000
--- a/bt5/vifib_core/PropertySheetTemplateItem/FreeFiberRequest.py
+++ /dev/null
@@ -1,19 +0,0 @@
-class FreeFiberRequest:
-  """
-  Property sheet for Free Fiber Request
-  """
-
-  _properties = (
-    { 'id'        : 'internet_service_provider',
-    'description' : 'Internet Service Provider',
-    'type'        : 'string',
-    'mode'        : 'w',
-    },
-    { 'id'        : 'home_status',
-    'description' : 'Home Status',
-    'type'        : 'string',
-    'mode'        : 'w',
-    },
-  )
-
-  #_categories = ( 'activity', 'function', 'nationality', 'gender' )
\ No newline at end of file
diff --git a/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest.xml b/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e79dc2c62406ffdef6513c559df675fd09914532
--- /dev/null
+++ b/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>FreeFiberRequest</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest/home_status_property.xml b/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest/home_status_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4233ce786f7250b7051c8b598f9d87656aece64a
--- /dev/null
+++ b/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest/home_status_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Home Status</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>home_status_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest/internet_service_provider_property.xml b/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest/internet_service_provider_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6669c3f642ca341d48134854036a5feb2d6846b0
--- /dev/null
+++ b/bt5/vifib_core/PropertySheetTemplateItem/portal_property_sheets/FreeFiberRequest/internet_service_provider_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Internet Service Provider</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>internet_service_provider_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_core/bt/revision b/bt5/vifib_core/bt/revision
index b5045cc4046dbc1d7cafa4c603fd3cdf35dc5dde..8fdd954df9831dfd29ceec0d74829b02f3f5d8c3 100644
--- a/bt5/vifib_core/bt/revision
+++ b/bt5/vifib_core/bt/revision
@@ -1 +1 @@
-21
\ No newline at end of file
+22
\ No newline at end of file
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/ComputerPartition.py b/bt5/vifib_slap/PropertySheetTemplateItem/ComputerPartition.py
deleted file mode 100644
index d0531f5cf1ff240262f2d5c15a26222fb60c44ce..0000000000000000000000000000000000000000
--- a/bt5/vifib_slap/PropertySheetTemplateItem/ComputerPartition.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-#                    Yusei TAHARA <yusei@nexedi.com>
-#                    Lukasz Nowak <luke@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-
-class ComputerPartition:
-  """
-  Computer Partition
-  """
-
-  _properties = (
-    { 'id'                       : 'network_address' # blind copy of Computer.py
-    , 'storage_id'               : 'default_network_address'
-    , 'description'              : 'The unique identity of the computer in computer network.'
-    , 'type'                     : 'content'
-    , 'portal_type'              : ( 'Internet Protocol Address', )#'Asynchronous Transfer Mode Address', 'UMTS Address' )
-    , 'acquired_property_id'     : ( 'text', 'host_name', 'ip_address', 'udp_port_number', 'tcp_port_number')
-    , 'acquisition_base_category': ( 'parent', )
-    , 'acquisition_portal_type'  : ( 'Computer Partition', )
-    , 'acquisition_copy_value'   : 0
-    , 'acquisition_mask_value'   : 1
-    , 'acquisition_sync_value'   : 0
-    , 'acquisition_accessor_id'  : 'getDefaultNetworkAddressValue'
-    , 'acquisition_depends'      : None
-    , 'alt_accessor_id'          : ()
-    , 'mode'                     : 'w'
-    },
-  )
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/InternetProtocolAddress.py b/bt5/vifib_slap/PropertySheetTemplateItem/InternetProtocolAddress.py
deleted file mode 100644
index b9f963c4cc5ee1cd9f241f09955fc61cc11088db..0000000000000000000000000000000000000000
--- a/bt5/vifib_slap/PropertySheetTemplateItem/InternetProtocolAddress.py
+++ /dev/null
@@ -1,84 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2008 Nexedi SA and Contributors. All Rights Reserved.
-#                    Yusei TAHARA <yusei@nexedi.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-
-class InternetProtocolAddress:
-    """
-        Information about IP address
-	(used by yet to add InternetProtocolAddress which is like a Phone / Address
-	please review following what mandriva in sysconfig 
-	
-	dhcp must be handled maybe with category
-    """
-
-    _properties = (
-        {   'id'          : 'host_name',
-            'description' : 'Hostname',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'ip_address',
-            'description' : 'IP Address',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'netmask',
-            'description' : 'Netmask',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'netmask_bit',
-            'description' : 'Netmask Bits',
-            'type'        : 'int',
-            'mode'        : 'w' },
-        {   'id'          : 'network_address',
-            'description' : 'Network Address',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'broadcast_address',
-            'description' : 'Broadcast Address',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'dns_server_ip_address',
-            'description' : 'DNS Server IP Address',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'gateway_ip_address',
-            'description' : 'Gateway IP Address',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'network_interface',
-            'description' : 'Network Interface',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'tcp_port_number',
-            'description' : 'Number of TCP port',
-            'type'        : 'string',
-            'mode'        : 'w' },
-        {   'id'          : 'udp_port_number',
-            'description' : 'Number of UDP port',
-            'type'        : 'string',
-            'mode'        : 'w' },
-    )
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/VifibSystemPreference.py b/bt5/vifib_slap/PropertySheetTemplateItem/VifibSystemPreference.py
deleted file mode 100644
index f4899fe6ea5a79c63bfc42cc59af78fdd043c3eb..0000000000000000000000000000000000000000
--- a/bt5/vifib_slap/PropertySheetTemplateItem/VifibSystemPreference.py
+++ /dev/null
@@ -1,32 +0,0 @@
-class VifibSystemPreference:
-  """Vifib System Preferences"""
-  _properties = (
-    { 'id'              : 'preferred_instance_cleanup_resource',
-      'description'     : 'Resource used to represent fact of cleaning up Software Instance',
-      'type'            : 'string',
-      'default'         :  '',
-      'preference'      : 1,
-      'write_permission': 'Manage properties',
-      'mode'            : 'w'},
-    { 'id'              : 'preferred_instance_hosting_resource',
-      'description'     : 'Resource used to represent fact of hosting operations on Software Instance',
-      'type'            : 'string',
-      'default'         :  '',
-      'preference'      : 1,
-      'write_permission': 'Manage properties',
-      'mode'            : 'w'},
-    { 'id'              : 'preferred_instance_setup_resource',
-      'description'     : 'Resource used to represent fact of Software Instance setup',
-      'type'            : 'string',
-      'default'         :  '',
-      'preference'      : 1,
-      'write_permission': 'Manage properties',
-      'mode'            : 'w'},
-    { 'id'              : 'preferred_software_setup_resource',
-      'description'     : 'Resource used to represent fact of Software Release setup',
-      'type'            : 'string',
-      'default'         :  '',
-      'preference'      : 1,
-      'write_permission': 'Manage properties',
-      'mode'            : 'w'},
-  )
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition.xml
new file mode 100644
index 0000000000000000000000000000000000000000..65151b6dadee4edb50b3cc1456b5d99e57e40cd2
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ComputerPartition</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition/network_address_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition/network_address_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f7c44a91c09d2851ea097ae611bc61d08b864a51
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition/network_address_property.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Acquired Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_depends</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>acquisition_sync_value</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>int</string> </value>
+                  </item>
+                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_accessor_id</string> </key>
+            <value> <string>getDefaultNetworkAddressValue</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
+            <value>
+              <tuple>
+                <string>parent</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_depends</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: (\'Computer Partition\',)</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>alt_accessor_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/content</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_acquired_property_id</string> </key>
+            <value>
+              <tuple>
+                <string>text</string>
+                <string>host_name</string>
+                <string>ip_address</string>
+                <string>udp_port_number</string>
+                <string>tcp_port_number</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_portal_type</string> </key>
+            <value> <string>python: (\'Internet Protocol Address\',)</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>The unique identity of the computer in computer network.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>network_address_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Acquired Property</string> </value>
+        </item>
+        <item>
+            <key> <string>storage_id</string> </key>
+            <value> <string>default_network_address</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress.xml
new file mode 100644
index 0000000000000000000000000000000000000000..006564e711c97975c6fe26e8d5c7ef86f661c58d
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>InternetProtocolAddress</string> </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>9</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/broadcast_address_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/broadcast_address_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ec780be984b39184421dc10a3a928e9e3cfbded9
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/broadcast_address_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Broadcast Address</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>broadcast_address_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/dns_server_ip_address_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/dns_server_ip_address_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b9a14687cb5f85cf50f0137f099a00e9f1caa83f
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/dns_server_ip_address_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>DNS Server IP Address</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>dns_server_ip_address_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/gateway_ip_address_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/gateway_ip_address_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d10a9ad0b6c51c03645a9a2d59a4d07e98bde1e0
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/gateway_ip_address_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Gateway IP Address</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>gateway_ip_address_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/host_name_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/host_name_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fe191d0c3e0c7d30c1dde82cebf6dbeaca9c98e0
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/host_name_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Hostname</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>host_name_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/ip_address_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/ip_address_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eca43a69ce6bd5d8eacabd982df523c8fc3a20e9
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/ip_address_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>IP Address</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ip_address_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/netmask_bit_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/netmask_bit_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7db20184678e7f7451437ace82c3a490cb432c9f
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/netmask_bit_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/int</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Netmask Bits</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>netmask_bit_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/netmask_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/netmask_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5e9680afeabef8cb739fdff0fbb7fb11f54b3522
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/netmask_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Netmask</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>netmask_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/network_address_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/network_address_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1859a10490dacc121cedeff8703fe3a7dc9878a
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/network_address_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Network Address</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>network_address_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/network_interface_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/network_interface_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..580dfdccaf9934b3150b876c73b0d9a0179e05e8
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/InternetProtocolAddress/network_interface_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Network Interface</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>network_interface_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference.xml
new file mode 100644
index 0000000000000000000000000000000000000000..563b012f3dcd0af875dfb922171682ade1eeaae7
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Sheet" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_count</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_mt_index</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>_tree</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>VifibSystemPreference</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Sheet</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Length" module="BTrees.Length"/>
+    </pickle>
+    <pickle> <int>0</int> </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="OOBTree" module="BTrees.OOBTree"/>
+    </pickle>
+    <pickle>
+      <none/>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_cleanup_resource_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_cleanup_resource_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fa4b21c4a0c4470a22edb1f1d8523cc6251d72e9
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_cleanup_resource_property.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Resource used to represent fact of cleaning up Software Instance</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>preferred_instance_cleanup_resource_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+        <item>
+            <key> <string>preference</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>property_default</string> </key>
+            <value> <string>python: \'\'</string> </value>
+        </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value> <string>Manage properties</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_hosting_resource_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_hosting_resource_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dbbb27ef82d2d58eafdc94fc2595e688069be385
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_hosting_resource_property.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Resource used to represent fact of hosting operations on Software Instance</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>preferred_instance_hosting_resource_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+        <item>
+            <key> <string>preference</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>property_default</string> </key>
+            <value> <string>python: \'\'</string> </value>
+        </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value> <string>Manage properties</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_setup_resource_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_setup_resource_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b25af725f4ddc88ec53e0a1e061c9b3553ffac5f
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_instance_setup_resource_property.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Resource used to represent fact of Software Instance setup</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>preferred_instance_setup_resource_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+        <item>
+            <key> <string>preference</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>property_default</string> </key>
+            <value> <string>python: \'\'</string> </value>
+        </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value> <string>Manage properties</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_software_setup_resource_property.xml b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_software_setup_resource_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c03d63971b6bcdef212ae47ca94bda2b656d9eca
--- /dev/null
+++ b/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_software_setup_resource_property.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/string</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Resource used to represent fact of Software Release setup</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>preferred_software_setup_resource_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string>w</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+        <item>
+            <key> <string>preference</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>property_default</string> </key>
+            <value> <string>python: \'\'</string> </value>
+        </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value> <string>Manage properties</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/vifib_slap/bt/revision b/bt5/vifib_slap/bt/revision
index 483387c8eca3b6ac0b24aa5571e4bbf76bc010c3..e8930b6df94cf1501f2663918ee3ceb4d40c709a 100644
--- a/bt5/vifib_slap/bt/revision
+++ b/bt5/vifib_slap/bt/revision
@@ -1 +1 @@
-363
\ No newline at end of file
+364
\ No newline at end of file