Modified to send the extra fields as I would expect them.