Added encryption key manager