Added classes describing water and properties for mixed drinks