Improve support for complex terrain