Fixed all the struct parsing