Added key management.