Use new version of c2c.template