Update data structures without waiting for file load to complete.
Updated mapper to combine results.
Merge branch 'race'