Fix Concurrency, internal refactoring