Refactor/notification

completed supports for new notification API