Add back model_thread; it is still needed