[AI-406] Refactored (again!) import process to be able to handle special cases