Additional work on NetworkManager.