Apply updated key-manager API