Last changes to make the import routine work.