Add network executor and modified save helper