Added WhitelistControl