[INTERNAL] generateMaps restructured