Update parser to exclude edge cases