Add watermarking support