Refactory Builder tree