Add support for whitelist