Adding whitelist functionality