Add server list support