Restructured for other tree types