change ServerState to simpler list from map