Use new interfaces for key manipulation.