AddressMapper update (dialog added, can be used as DPU)
Removed termination after first failure, log moved to right position