New feature: watermarking templates