--- a/src/pyams_content/shared/site/zmi/__init__.py	Wed Nov 06 16:54:59 2019 +0100
+++ b/src/pyams_content/shared/site/zmi/__init__.py	Tue Nov 19 16:39:10 2019 +0100
@@ -10,9 +10,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 
-__docformat__ = 'restructuredtext'
-
-
 from uuid import uuid4
 
 from pyramid.decorator import reify
@@ -23,10 +20,10 @@
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.schema import Int
 
-from pyams_content import _
 from pyams_content.interfaces import CREATE_CONTENT_PERMISSION
-from pyams_content.shared.common.interfaces import IWfSharedContent
-from pyams_content.shared.common.zmi import SharedContentAJAXAddForm, SharedContentAddForm
+from pyams_content.shared.common.zmi import SharedContentAJAXAddForm
+from pyams_content.shared.common.zmi.types import TypedSharedContentAddForm
+from pyams_content.shared.site import IWfSiteTopic
 from pyams_content.shared.site.interfaces import ISiteContainer, ISiteManager
 from pyams_content.shared.site.zmi.widget import SiteManagerFoldersSelectorFieldWidget
 from pyams_form.form import ajax_config
@@ -43,6 +40,11 @@
 from pyams_zmi.layer import IAdminLayer
 
 
+__docformat__ = 'restructuredtext'
+
+from pyams_content import _
+
+
 @viewlet_config(name='add-topic.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface,
                 manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=20)
 class TopicAddMenu(ToolbarMenuItem):
@@ -54,7 +56,7 @@
     modal_target = True
 
 
-class ITopicAddFormFields(IWfSharedContent):
+class ITopicAddFormFields(IWfSiteTopic):
     """Topic add form fields interface"""
 
     parent = Int(title=_("Parent"),
@@ -68,12 +70,12 @@
                 permission=CREATE_CONTENT_PERMISSION)
 @ajax_config(name='add-topic.json', context=ISiteContainer, layer=IPyAMSLayer,
              base=SharedContentAJAXAddForm)
-class TopicAddForm(SharedContentAddForm):
+class TopicAddForm(TypedSharedContentAddForm):
     """Topic add form"""
 
     legend = _("Add topic")
 
-    fields = field.Fields(ITopicAddFormFields).select('title', 'parent', 'notepad')
+    fields = field.Fields(ITopicAddFormFields).select('title', 'data_type', 'parent', 'notepad')
     fields['parent'].widgetFactory = SiteManagerFoldersSelectorFieldWidget
 
     edit_permission = CREATE_CONTENT_PERMISSION