Added a whitelist and blacklist feature