Major refactoring of templates