Change calls to cpu to refer to new constructor