Re-scaling models to 1000x

COM-11620 & PRT-11662