Added attribute whitelisting.