Fix to eliminate the dependency of `Template`