Added support for greater concurrency