Updated config, network related and sahara enabled