Import update refactoring