Moved some responsibilities away from the EncryptionManager