Making project thread safe