Added TODO to seperate signing and self-encryption key