Various changes to make 'Host' structure changeable