Updated template definition