Added Whitelisting (need rework)