Changes for New Crypt/Decrypt Module