Revert "Removed whitelisting"

This reverts commit 0606506f7edd3edbb93c9494502b985d6b09214c.
Final fix fix

No more commits for whitelisting please!