Refactor watermark
Documentation updates