updated container and device models
updated water model