updated template structure