Fix EventParser's expected format