[IMPORT Tool] Refacto + improved handling