Updates to threadsafety