Exported lib, needed by ADT 22
Network optimization; upgrade handling