[Experimental] Added water support into the layers

But in something tests we get the crash