Add encryption subkey tracking