Added notifier interface + fixed orm and odm mappings