CPUStats now returns a map
correct naming of Swap related functions