Added cpu.* and logging