[Robustness] Modifying Annex E to support Robustness?