Add new templates
Refactoring