Refactor - scope api changed to easier for mantaing (in future) concurrency