Add highwatermark option for myself