Switch the hsotinfo over to be instance based and resolved from the
container