Moving Water condition related data into container structs