Feature/host refactoring