Modified parallel loading of datasources.

Change-Id: Ib475c792acdd8bbeecc6fbd275a8aec890d297cb