Better wildcard code