Modified control parser so extra fields are kept