Making locations thread safe