Add support for highwater fields