Improve key management.