More work on NetworkManagerClass
Some code reorganization and addition