Add support for wildcard '*'