Updated with ServerInfo and associated classes