Better PO parser