ES Notification system improved