Updated templated to v2.0