Adjustments to event importer