Add in ViewNotificationHandler