Host instance refactor