move serverId to its own field