Added wildcard matching