Update to fix threading issue with imports