Added some parse stuff