adding whitelist support