Added support for wildcard parsing