NotificationAspect upgrade