Changes on parsing