Updated tree class and parse stuff