make it work with new pluggable Addresses