Notification changes to support demo