Templates refactoring