update for new key support