MAB2Parser updated