Future proofing

Future proofing