Re-encrypted keys
refactor