Changed Parser to OOP