MS420: Add support for whitelist