adding whitelist capability