Improve wildcard support