Added whitelist control
Updates