Improve importation according to Import / Export + diff.
Not yet finished