added support for new templates