Changes on Parser