Adapt the importer to let the ids being generated within the entities. Fix some incoherences with object model