Global update of parsing logic