Refactor loading of aggregates and some minor changes
0.0.23 Codename: Illuminati