Correct definition of the Whitelist and use a vector for a better locality