Support for 8.2 EAP