Updated ninjeff.EventParser