Parser modified