Improved Site tree