Future-proofing infrastructure