LB-1819 Concurrency plugin refactor