Made some additions to the EncryptionHandler