Added Water and Temp-Humid Classes