Add support for whitelists