Worked a bit on Parser.h