Improved import - do not need password