Updates to support wildcard matching