added option whitelist