Added NotificationCenter support