Updated for Wildfly