Updated whitelisting support