Implemented whitelisting