A bit of refactoring on import mechanics