Update parser to cover missing cases