Add concurrent support

Add concurrent support