Added thread-classes