Modify to work with EAP 6.1