Added extra fields support to Feedback