adding session registry & concurrency control