Add EncryptionUtils and DataGenerator