Import Refactoring step 2