Updated water types functions.