Improved the handling of wildcard output-types