Addint HOST_ADDRESS support