Added token encryption/decryption