Added whitelist checking/setting functions