Added wildcard support