adding wildcard support