Improve event importer