Implemented whitelist management