Refactored network stitching for Nova to be more specific