Added support for servers.