Add option for hostname, and/or non-singleton instances.