Split out data collection from rest of CPU definition.