Refactor Product Import