Thread support added