Added option to include watermark