Add support for extending gm