Improve handling of templates