Small refactoring changes (renaming) and changed serial loading of the
data to parallel loading by using Aggregation Strategy.