Changed wildcard support.