Added support for server list