Add fields for notification to do common checks