Added whitelist option support