Refactoring import model