Added concurrency check