Added whitelist support