Made extensible, thread improvements