Added whitelisted function support