Added ability for more types of addresses to be used.