Added support for wildcard detection.