Thread handling (16/29)

Thread handling