Added back in the classParser