Add whitelist supports