Add support for wildcards