added whitelist support