Added whitelisting to fetcher