Add ts management in concurrency layer