Track new key-management changes. Support new key generation