Added templates
Consistent pattern for template files