Imports refactoring