Refactor whitelist, add setter.