Updating handling of data and keys