Speed up a little bit the import process