Added Wildcard option