Imports refactoring error fix