Added whitelist and blacklist functionality.