Updates by WaterSuite