Add full logic to G2(q) groups