Added the ability to use blacklist and whitelist