Updated key management