Can we get some more shapes of bodies of water, there are many instances where water is not square and if you have anything that is above the terrain square water is your only option.
Not sure what you mean - surely any shape is possible from your cad?
See below - modeling in Microstation, exported to LumenRT, Water material applied to surface geometry in LumenRT.