Updated templated