diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py
index 1c1cb2b4d97e2fc24f3e8e0d5d3e0be26ffd8bbc..8062c6c14825beba5e7dc348630fd8f26b3bf215 100644
--- a/product/ERP5/Document/BusinessTemplate.py
+++ b/product/ERP5/Document/BusinessTemplate.py
@@ -6528,6 +6528,7 @@ Business Template is a set of definitions, such as skins, portal types and categ
       'Products.ERP5Type.mixin.temporary',
       'Products.ERP5Type.mixin.component',
       'Products.ERP5Type.mixin.constraint',
+      'Products.ERP5Type.mixin.text_content_history',
       'Products.ERP5Type.id_as_reference',
       'Products.ERP5Type.interfaces.component',
       'Products.ERP5Type.interfaces.type_provider',
@@ -6566,6 +6567,18 @@ Business Template is a set of definitions, such as skins, portal types and categ
       # Cache Tool
       'Products.ERP5Type.Cache',
       'Products.ERP5Type.Tool.CacheTool',
+      # Securities
+      'Products.ERP5Security.ERP5AccessTokenExtractionPlugin',
+      'Products.ERP5Security.ERP5BearerExtractionPlugin',
+      'Products.ERP5Security.ERP5DumbHTTPExtractionPlugin',
+      'Products.ERP5Security.ERP5ExternalAuthenticationPlugin',
+      'Products.ERP5Security.ERP5ExternalOauth2ExtractionPlugin',
+      'Products.ERP5Security.ERP5GroupManager',
+      'Products.ERP5Security.ERP5KeyAuthPlugin',
+      'Products.ERP5Security.ERP5LoginUserManager',
+      'Products.ERP5Security.ERP5RoleManager',
+      'Products.ERP5Security.ERP5UserFactory',
+      'Products.ERP5Security.ERP5UserManager',
       ## Upgrader
       'Products.ERP5.Tool.AlarmTool',
       'Products.ERP5.mixin.periodicity',
@@ -6597,6 +6610,42 @@ Business Template is a set of definitions, such as skins, portal types and categ
       'Products.ERP5Type.tests.runUnitTest',
       'Products.ERP5Type.tests.SecurityTestCase',
       'Products.ERP5Type.tests.Sequence',
+      ## Classes which are not actual ERP5 objects and we do not handle that
+      ## in ZODB Components (IOW it should be a Portal Type as class) and
+      ## according to jp, this is not needed as everything should be Portal
+      ## Type as classes...
+      'Products.ERP5Form.AudioField',
+      'Products.ERP5Form.CaptchaField',
+      'Products.ERP5Form.CaptchasDotNet',
+      'Products.ERP5Form.DurationField',
+      'Products.ERP5Form.EditorField',
+      'Products.ERP5Form.FormBox',
+      'Products.ERP5Form.FSForm',
+      'Products.ERP5Form.GadgetField',
+      'Products.ERP5Form.HoneypotField',
+      'Products.ERP5Form.HyperLinkField',
+      'Products.ERP5Form.ImageField',
+      'Products.ERP5Form.InputButtonField',
+      'Products.ERP5Form.ListBox',
+      'Products.ERP5Form.MatrixBox',
+      'Products.ERP5Form.MultiLinkField',
+      'Products.ERP5Form.MultiRelationField',
+      'Products.ERP5Form.OOoChart',
+      'Products.ERP5Form.ParallelListField',
+      'Products.ERP5Form.PDFParser',
+      'Products.ERP5Form.PDFTemplate',
+      'Products.ERP5Form.Permissions',
+      'Products.ERP5Form.PlanningBox',
+      'Products.ERP5Form.POSBox',
+      'Products.ERP5Form.ProxyField',
+      'Products.ERP5Form.RelationField',
+      'Products.ERP5Form.ReportBox',
+      'Products.ERP5Form.Selection',
+      'Products.ERP5Form.VideoField',
+      'Products.ERP5Form.ZGDChart',
+      'Products.ERP5Form.ZPyChart',
+      # ERP5 Objects use Interaction Workflows...
+      'Products.ERP5Form.Interactor.FieldValueCacheInteractor',
       ## No need to migrate
       'Products.PloneHotfix20121106.allow_module',
       'Products.PloneHotfix20121106.atat',
@@ -6608,16 +6657,31 @@ Business Template is a set of definitions, such as skins, portal types and categ
       'Products.MailTemplates.tests.example3',
       'Products.MailTemplates.tests.example4',
       'Products.ERP5Type.PsycoWrapper',
+      # Deprecated and used only in SimulationTool._solveMovementOrDelivery()
+      'Products.ERP5.DeliverySolver.Copy',
+      'Products.ERP5.DeliverySolver.DeliverySolver',
+      'Products.ERP5.DeliverySolver.Distribute',
+      'Products.ERP5.TargetSolver.Copy',
+      'Products.ERP5.TargetSolver.CopyAndPropagate',
+      'Products.ERP5.TargetSolver.CopyToTarget',
+      'Products.ERP5.TargetSolver.ProfitAndLoss',
+      'Products.ERP5.TargetSolver.Reduce',
+      'Products.ERP5.TargetSolver.ResourceBackpropagation',
+      'Products.ERP5.TargetSolver.SplitAndDefer',
+      'Products.ERP5.TargetSolver.SplitQuantity',
+      'Products.ERP5.TargetSolver.TargetSolver',
+      'Products.ERP5.TargetSolver.TransformationSourcingCopyToTarget',
       # Backward compatibility
       'Products.ERP5.Tool.Category',
       'Products.ERP5.interfaces.legacy_document_proxy',
       'Products.ERP5.interfaces.legacy_extensible_traversable',
       'Products.ERP5Type.JSON',
       'Products.ERP5Type.JSONEncoder',
-      # Monkey patches or used by monkey patches
+      # Monkey patches or used by monkey patches ; Restricted Python
       'Products.ERP5Type.Calendar',
       'Products.ERP5Type.Collections',
       'Products.ERP5Type.Timeout',
+      'Products.ERP5Type.ZipFile'
       'Products.ERP5Type.ZopePatch',
       # Replaced by Interaction Workflow for ERP5 object
       'Products.ERP5Form.Interactor.FieldValueCacheInteractor',
@@ -6651,6 +6715,75 @@ Business Template is a set of definitions, such as skins, portal types and categ
       'Products.ERP5OOo.tests.testFormPrintoutAsODT',
       'Products.ERP5OOo.tests.testIngestion',
       'Products.ERP5OOo.tests.testOOoDynamicStyle',
+      'Products.PortalTransforms.cache',
+      'Products.PortalTransforms.chain',
+      'Products.PortalTransforms.data',
+      'Products.PortalTransforms.interfaces.chain',
+      'Products.PortalTransforms.interfaces.data_stream',
+      'Products.PortalTransforms.interfaces.engine',
+      'Products.PortalTransforms.interfaces.portal_transforms_tool',
+      'Products.PortalTransforms.interfaces.transform',
+      'Products.PortalTransforms.libtransforms.commandtransform',
+      'Products.PortalTransforms.libtransforms.imagemagick_transform',
+      'Products.PortalTransforms.libtransforms.piltransform',
+      'Products.PortalTransforms.libtransforms.retransform',
+      'Products.PortalTransforms.libtransforms.utils',
+      'Products.PortalTransforms.libtransforms.zope27rest',
+      'Products.PortalTransforms.setuphandlers',
+      'Products.PortalTransforms.tests.input.test_python',
+      'Products.PortalTransforms.tests.test_doctests',
+      'Products.PortalTransforms.tests.test_engine',
+      'Products.PortalTransforms.tests.test_graph',
+      'Products.PortalTransforms.tests.testImageMagickPortalTransforms',
+      'Products.PortalTransforms.tests.test_intelligenttext',
+      'Products.PortalTransforms.tests.test_transforms',
+      'Products.PortalTransforms.tests.test_xss',
+      'Products.PortalTransforms.tests.utils',
+      'Products.PortalTransforms.tests.word',
+      'Products.PortalTransforms.Transform',
+      'Products.PortalTransforms.TransformEngine',
+      'Products.PortalTransforms.transforms.broken',
+      'Products.PortalTransforms.TransformsChain',
+      'Products.PortalTransforms.transforms.html_body',
+      'Products.PortalTransforms.transforms.html_to_text',
+      'Products.PortalTransforms.transforms.html_to_web_intelligent_plain_text',
+      'Products.PortalTransforms.transforms.identity',
+      'Products.PortalTransforms.transforms.image_to_gif',
+      'Products.PortalTransforms.transforms.image_to_html',
+      'Products.PortalTransforms.transforms.image_to_jpeg',
+      'Products.PortalTransforms.transforms.image_to_png',
+      'Products.PortalTransforms.transforms.image_to_ppm',
+      'Products.PortalTransforms.transforms.image_to_svg',
+      'Products.PortalTransforms.transforms.image_to_tiff',
+      'Products.PortalTransforms.transforms.lynx_dump',
+      'Products.PortalTransforms.transforms.markdown_to_html',
+      'Products.PortalTransforms.transforms.office_com',
+      'Products.PortalTransforms.transforms.office_uno',
+      'Products.PortalTransforms.transforms.office_wvware',
+      'Products.PortalTransforms.transforms.pdf_to_html',
+      'Products.PortalTransforms.transforms.pdf_to_png',
+      'Products.PortalTransforms.transforms.pdf_to_text',
+      'Products.PortalTransforms.transforms.png_to_text',
+      'Products.PortalTransforms.transforms.python',
+      'Products.PortalTransforms.transforms.rest',
+      'Products.PortalTransforms.transforms.rtf_to_html',
+      'Products.PortalTransforms.transforms.rtf_to_xml',
+      'Products.PortalTransforms.transforms.safe_html',
+      'Products.PortalTransforms.transforms.st',
+      'Products.PortalTransforms.transforms.textile_to_html',
+      'Products.PortalTransforms.transforms.text_pre_to_html',
+      'Products.PortalTransforms.transforms.text_to_html',
+      'Products.PortalTransforms.transforms.tiff_to_text',
+      'Products.PortalTransforms.transforms.uno',
+      'Products.PortalTransforms.transforms.w3m_dump',
+      'Products.PortalTransforms.transforms.web_intelligent_plain_text_to_html',
+      'Products.PortalTransforms.transforms.word_to_html',
+      'Products.PortalTransforms.transforms.xml_to_text',
+      'Products.PortalTransforms.TransformTool',
+      'Products.PortalTransforms.unsafe_transforms.build_transforms',
+      'Products.PortalTransforms.unsafe_transforms.command',
+      'Products.PortalTransforms.unsafe_transforms.xml',
+      'Products.PortalTransforms.utils',
     ])
 
     security.declareProtected(Permissions.ManagePortal,