Added structure for system and cpu_defs.