Added Whitelist enumeration