Refactoring
Added user to whitelist