Initial commit for whitelist fix