add wildcard support