Add concurrency and ContentProvider units