Some changes in template structure