Made FolderService threadsafe