Add CGE support