Add support for G2