Make tree loading more lazy