Adding better disk and CPU tracking