Add support for highwater