Download/import improvements