Second iteration of hosts zone support