Expanded whitelist