Added network manager support