Updated whitelist functions