Added partial tree support