Advanced Parser Update