Revised Annex E and Annex F