Added ability to query by address