Adding Concurrent handling