improved generated template
new templates