Update: Better handle multithreading