Update to notifier v2

Only including fields that are used across all notifiers.
Remove wrong limit
Merge branch 'v2'