Updated template structure