Upgrade to support Annex A and B