Added some classes to the parser