Added wildcard (*) support