Add wildcard resolution