data-import refactoring and specs update