Updated parser class organization