Improve the whitelist so that it can be added too from many places, follows the singleton pattern