* Update EMV2 definition with type equivalences