Added water and hitcell class