Added whitelisting