added watermark support