Added regex matching, and blacklist/whitelist