Notification on add and edit WIP