:lipstick: Wildcard matching

Added some wildcard matching to reduce LOC