Added 2 extra fields in the form