Added support for EAP 6