Added partial support for EAP 5.