Add support for querying addresses and more