improving support for whitelists