WTP 3.6 support