Added WaterQuality scaffold