Adding contexts to AES modes