Added subclasses for convenience construction of four- and five-site waters.