Improved wildcard support