Wildfly compatibility (WIP)