Hi Hardy Ferentschik, I played around a bit with it and think I've got a working solution, still need to run the TCK against the WildFly master though. Should we have a quick chat about it online?