update opo parser to new struct