Added in the encryption component