Adding whitelist support