Onix parsing enhanced