Added NotificationControl