Making it threadsafe by default