Tagged future-proofing