Update to new Hyper Host format