Add support for named servers.