More refactorings, better concurrency support on Use method