Updating to support wildcard address