Added full tree construction