Update to use new ScaleFactor type param