Add support for remapping DNS hosts
Fix DNS spec.