Better handling for wildcards