Switch to attribute whitelisting