Add CpuType to differentiate between models/variants