Updated to use wildcards.