--- a/src/pyams_content/shared/imagemap/zmi/area.py	Wed Jun 06 13:32:14 2018 +0200
+++ b/src/pyams_content/shared/imagemap/zmi/area.py	Fri Jun 08 10:33:23 2018 +0200
@@ -26,12 +26,11 @@
 from pyams_content.shared.imagemap import ImageMapArea
 from pyams_content.shared.imagemap.zmi.container import ImagemapAreasContainerView
 from pyams_content.shared.imagemap.zmi.widget import ImgareaInputFieldWidget
-from pyams_form.form import AJAXAddForm, AJAXEditForm
+from pyams_form.form import AJAXAddForm, ajax_config
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_skin.viewlet.toolbar import ToolbarAction
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogAddForm, AdminDialogEditForm
-from pyramid.view import view_config
 from z3c.form import field
 
 from pyams_content import _
@@ -58,6 +57,7 @@
 
 
 @pagelet_config(name='add-area.html', context=IWfImageMap, layer=IPyAMSLayer, permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='add-area.json', context=IWfImageMap, layer=IPyAMSLayer, base=AJAXAddForm)
 class ImagemapAreaAddForm(AdminDialogAddForm):
     """Imagemap area add form"""
 
@@ -80,7 +80,6 @@
     fields = field.Fields(IImageMapArea)
     fields['area'].widgetFactory = ImgareaInputFieldWidget
 
-    ajax_handler = 'add-area.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
 
     def create(self, data):
@@ -93,13 +92,8 @@
         return 'areas.html'
 
 
-@view_config(name='add-area.json', context=IWfImageMap, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ImagemapAreaAJAXAddForm(AJAXAddForm, ImagemapAreaAddForm):
-    """Image map area add form, JSON renderer"""
-
-
 @pagelet_config(name='properties.html', context=IImageMapArea, layer=IPyAMSLayer, permission=MANAGE_CONTENT_PERMISSION)
+@ajax_config(name='properties.json', context=IImageMapArea, layer=IPyAMSLayer)
 class ImagemapAreaPropertiesEditForm(AdminDialogEditForm):
     """Image map area properties edit form"""
 
@@ -124,11 +118,4 @@
     fields = field.Fields(IImageMapArea)
     fields['area'].widgetFactory = ImgareaInputFieldWidget
 
-    ajax_handler = 'properties.json'
     edit_permission = MANAGE_CONTENT_PERMISSION
-
-
-@view_config(name='properties.json', context=IImageMapArea, request_type=IPyAMSLayer,
-             permission=MANAGE_CONTENT_PERMISSION, renderer='json', xhr=True)
-class ImagemapAreaPropertiesAJAXEditForm(AJAXEditForm, ImagemapAreaPropertiesEditForm):
-    """Image map properties edit form, JSON rendener"""