Major updates to Event and System Map parsers.