Refactored aggregatekinduri and aggregaterooturi, slight simplification of memory storage map