Updated Template from CanonicalForm