Add parsing of structs