Add support for <thread/>
0.5.0