Add Water classes