Adding whitelist support with whitelist path