Changed Parser base class
WIP