Updated Sms and EncryptionSuite