Adding XML Parser, change basic structures