Improved complex terrain support