WIP refactoring and adding whitelist management