Added presat water suppression method, refined probe subclass structure, ... based on meeting with local experts.