Updates to thread model