Better support for partial tree loading