Added header files and some methods for the parser