Added parser.cpp functionality