Updated <template> support