Added whitelist functionality