Added whitelist support [tracker #1362]