Add timeout to Notification handler