Added concurency handling