Host refactor