Add Field Aut logic for G2 type