Update vectoriser now that Scalar has moved