Extended watermark support