Better logging and support of import of old files.