Updated new template structure