Parse new format & support 64 modulars
Sync with dev name