Updated cryptography with new setup class