Added support for G2