Update to stop the threads on component stops