Merged parser into main branch