added in support for hostname / address