host imports refactoring