e-Address Mapper code revision, support for cancel