Add improvements for wildcards