Add wildcard support