Updated for JBoss EAP 5