Added Basic whitelisting