Addresses can be mapped explicitly
improvements to address mapping