Added whitelist option