TemplateMappings
notify_event saving
notify_event improved