Still only using geometries
Manage the two cases: importing or not importing geometries. Still bugged