Make watermark operation more flexible