Added AES support