Added the ability to whitelist keys