Feature/new notification system